Fixing TMO Conference Call Attempt leaves Dialer App in a Zombie state.android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soonglollipop-mr1-dev

When conference call is failed, the mUpdateRequest of both host and peer
imscalls should be updated to UPDATE_NONE.

Bug:  19285127
Change-Id: Ib4afcbf3223d0f0be856e3686f899ade38235e96

1 files changed, 3 insertions, 2 deletions

diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java
index 9522da0d..fe15a52c 100644
--- a/src/java/com/android/ims/ImsCall.java
+++ b/src/java/com/android/ims/ImsCall.java
@@ -1711,8 +1711,6 @@ public class ImsCall implements ICall {
                 }
             }
 
-            clearMergePeer();
-
             // Clear some flags.  If the merge eventually worked, we can safely
             // ignore the call terminated message for the old session since we closed it already.
             clearSessionTerminationInfo();
@@ -1722,6 +1720,7 @@ public class ImsCall implements ICall {
                 mMergeHost.clearSessionTerminationInfo();
             }
 
+            clearMergePeer();
         }
         if (listener != null) {
             try {
@@ -2672,11 +2671,13 @@ public class ImsCall implements ICall {
 
         if (mMergeHost != null) {
             mMergeHost.mMergePeer = null;
+            mMergeHost.mUpdateRequest = UPDATE_NONE;
             mMergeHost = null;
         }
 
         if (mMergePeer != null) {
             mMergePeer.mMergeHost = null;
+            mMergePeer.mUpdateRequest = UPDATE_NONE;
             mMergePeer = null;
         }
     }