commit 73fe1489812922e6b9583eeb080e20b420aa4d7a
author Libin.Tang@motorola.com <w16529@motorola.com> Thu Feb 05 22:12:09 2015 -0600
committer The Android Automerger <android-build@google.com> Fri Feb 06 17:59:51 2015 -0800
tree 5d477d30b169a5de807d27f130e499d66f3d906e
parent bfd71b054006f2f2bf47355ae765b8ab789148f6

Fixing TMO Conference Call Attempt leaves Dialer App in a Zombie state.

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

Bug:  19285127
Change-Id: Ib4afcbf3223d0f0be856e3686f899ade38235e96

src/java/com/android/ims/ImsCall.java

diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java
index 9522da0..fe15a52 100644
--- a/src/java/com/android/ims/ImsCall.java
+++ b/src/java/com/android/ims/ImsCall.java
@@ -1711,8 +1711,6 @@
                 }
             }
 
-            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 @@
                 mMergeHost.clearSessionTerminationInfo();
             }
 
+            clearMergePeer();
         }
         if (listener != null) {
             try {
@@ -2672,11 +2671,13 @@
 
         if (mMergeHost != null) {
             mMergeHost.mMergePeer = null;
+            mMergeHost.mUpdateRequest = UPDATE_NONE;
             mMergeHost = null;
         }
 
         if (mMergePeer != null) {
             mMergePeer.mMergeHost = null;
+            mMergePeer.mUpdateRequest = UPDATE_NONE;
             mMergePeer = null;
         }
     }