commit 5af0565c03f3cd593499c76ea7a21cd9e38de3bf
author Roshan Pius <rpius@google.com> Mon Sep 21 16:51:31 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 21 16:51:31 2015 +0000
tree d61b49b2d1d6b0c5dc520f111312df0a066ee478
parent 981f7da8de8fcbf4acfa877a8a88c70ec480dcdd
parent caf84dca8bd90016d910198f1b178ac03e82dd07

Merge "Disallow call unhold if the fg call is dialing."

sip/src/com/android/services/telephony/sip/SipConnection.java

diff --git a/sip/src/com/android/services/telephony/sip/SipConnection.java b/sip/src/com/android/services/telephony/sip/SipConnection.java
index e9f8e05..7555656 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnection.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnection.java
@@ -145,7 +145,8 @@
     public void onUnhold() {
         if (VERBOSE) log("onUnhold");
         try {
-            if (getPhone() != null && getState() == STATE_HOLDING) {
+            if (getPhone() != null && getState() == STATE_HOLDING &&
+                    getPhone().getForegroundCall().getState() != Call.State.DIALING) {
                 getPhone().switchHoldingAndActive();
             }
         } catch (CallStateException e) {