am 4a04a312: am bd229420: Fix the unhold issue especially if one is behind NAT.

Merge commit '4a04a3129bd30a996dd302b982aeca8f228f57e8'

* commit '4a04a3129bd30a996dd302b982aeca8f228f57e8':
  Fix the unhold issue especially if one is behind NAT.

1 files changed, 12 insertions, 1 deletions

diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
index 08194d4..ed581df 100755
--- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
@@ -636,6 +636,18 @@ public class SipPhone extends SipPhoneBase {
             }
 
             @Override
+            public void onCallEstablished(SipAudioCall call) {
+                call.startAudio();
+                onChanged(call);
+            }
+
+            @Override
+            public void onCallHeld(SipAudioCall call) {
+                call.startAudio();
+                onChanged(call);
+            }
+
+            @Override
             public void onChanged(SipAudioCall call) {
                 synchronized (SipPhone.class) {
                     Call.State newState = getCallStateFrom(call);
@@ -655,7 +667,6 @@ public class SipPhone extends SipPhoneBase {
                             }
                             foregroundCall.switchWith(ringingCall);
                         }
-                        if (newState == Call.State.ACTIVE) call.startAudio();
                         setState(newState);
                     }
                     mOwner.onConnectionStateChanged(SipConnection.this);