commit 2c41b03614ab4fa92bab8cf3bb4f627dd3de2505
author Roshan Pius <rpius@google.com> Fri Oct 16 20:30:38 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 16 20:30:38 2015 +0000
tree d062782ca611a899ab3b671399a1b894c87650c3
parent 4039488ef1de5be6a63b9111839f61d8b4d509e7
parent e6de96e55d50429d5a674a329bdf380c78e25dc1

am e6de96e5: am 27785ea6: DO NOT MERGE Disallow call unhold if the fg call is dialing.

* commit 'e6de96e55d50429d5a674a329bdf380c78e25dc1':
  DO NOT 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 173bc99..0d8a6f8 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnection.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnection.java
@@ -152,7 +152,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) {
                 // Double check with the internal state since a discrepancy in states could mean
                 // that the transaction is already in progress from a previous request.
                 if (mOriginalConnection != null &&