commit 33290100c702ea8a1d4fcede360fc81e81bfccb2
author Tyler Gunn <tgunn@google.com> Thu Aug 18 10:40:24 2016 -0700
committer Tyler Gunn <tgunn@google.com> Thu Aug 18 10:40:24 2016 -0700
tree 459a6f177b13ada715f85793b5bc7f1ca0da693b
parent 8e3273bee920710cad3dda10baea31e633ec17cc

Fire connection events when call is remotely held and unheld.

Bug: 30349182
Change-Id: Icb94db6a8c146db7d4e63108cb19b16ea438f212

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
index 096b757..e1ae3e3 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
@@ -1714,9 +1714,13 @@
         public void onCallResumeReceived(ImsCall imsCall) {
             if (DBG) log("onCallResumeReceived");
             ImsPhoneConnection conn = findConnection(imsCall);
-            if (conn != null && mOnHoldToneStarted) {
-                mPhone.stopOnHoldTone(conn);
-                mOnHoldToneStarted = false;
+            if (conn != null) {
+                if (mOnHoldToneStarted) {
+                    mPhone.stopOnHoldTone(conn);
+                    mOnHoldToneStarted = false;
+                }
+
+                conn.onConnectionEvent(android.telecom.Connection.EVENT_CALL_REMOTELY_UNHELD, null);
             }
 
             SuppServiceNotification supp = new SuppServiceNotification();
@@ -1733,12 +1737,15 @@
             if (DBG) log("onCallHoldReceived");
 
             ImsPhoneConnection conn = findConnection(imsCall);
-            if (conn != null && conn.getState() == ImsPhoneCall.State.ACTIVE) {
-                if (!mOnHoldToneStarted && ImsPhoneCall.isLocalTone(imsCall)) {
+            if (conn != null) {
+                if (!mOnHoldToneStarted && ImsPhoneCall.isLocalTone(imsCall) &&
+                        conn.getState() == ImsPhoneCall.State.ACTIVE) {
                     mPhone.startOnHoldTone(conn);
                     mOnHoldToneStarted = true;
                     mOnHoldToneId = System.identityHashCode(conn);
                 }
+
+                conn.onConnectionEvent(android.telecom.Connection.EVENT_CALL_REMOTELY_HELD, null);
             }
 
             SuppServiceNotification supp = new SuppServiceNotification();