commit 740e31b5407af1879548e952d774d07fdb87f16e
author mike dooley <mdooley@google.com> Tue Feb 17 10:56:13 2015 -0800
committer The Android Automerger <android-build@google.com> Tue Feb 17 16:32:09 2015 -0800
tree 3b1e44280ace7acf229ae2486f482222bef15b12
parent 908d3bea3befe552e6283d6728c10f11eb04b65e

Fix Cdma conference cleanup bug.

The conference pointer in the CdmaConferenceController wasn't being cleared after the
conference was destroyed.  This prevented subsequent conferences from being created
correctly (ie. couldn't merge calls into a new conference).

Bug: 19355781, 18612712
Change-Id: I0612d7e2f89cdb56ed330289d08ee4e7ef007970

src/com/android/services/telephony/CdmaConferenceController.java

diff --git a/src/com/android/services/telephony/CdmaConferenceController.java b/src/com/android/services/telephony/CdmaConferenceController.java
index 3d90fd3..8a26365 100644
--- a/src/com/android/services/telephony/CdmaConferenceController.java
+++ b/src/com/android/services/telephony/CdmaConferenceController.java
@@ -189,6 +189,7 @@
             if (mConference != null) {
                 Log.i(this, "Destroying the CDMA conference connection.");
                 mConference.destroy();
+                mConference = null;
             }
         }
     }