commit e1ae38f714c57aa4dd35184e7cd9017d47c1515b
author mike dooley <mdooley@google.com> Tue Feb 17 23:32:05 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 17 23:32:05 2015 +0000
tree 3b1e44280ace7acf229ae2486f482222bef15b12
parent 0918d946e9711796acd766bac053b6dedf21f079
parent 2171a56f8a22b3dcd6a6fd81b3742110190c9676

Merge "Fix Cdma conference cleanup bug." into lmp-mr1-dev

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;
             }
         }
     }