commit 642c8c0168ab1eb76ed6c8bcefe16ecc932d435c
author Santos Cordon <santoscordon@google.com> Tue Jul 14 18:14:44 2015 +0000
committer Santos Cordon <santoscordon@google.com> Tue Jul 14 18:16:45 2015 +0000
tree b18a350b222f633e474e851cf7045d748633705e
parent 207ec8c2dd1927edb5332afcafacccebfd2ca210

Revert "Revert "Add missing unregistrations when a connection ends.""

This reverts commit 207ec8c2dd1927edb5332afcafacccebfd2ca210.

Yes, this is a revert of a revert...IOW, I'm putting the original change
back in.

Original change information:
[[
  Bug: 22410282
  Change-Id: Ic2698d9ae768e27a346f71c7b0cd99c9a490e801
]]

Change-Id: I796bdc35ff727a46b766056ad9b2a4aabead0814

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

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 8c09a95..421fbda 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -581,10 +581,14 @@
      */
     void clearOriginalConnection() {
         if (mOriginalConnection != null) {
-            getPhone().unregisterForPreciseCallStateChanged(mHandler);
-            getPhone().unregisterForRingbackTone(mHandler);
-            getPhone().unregisterForHandoverStateChanged(mHandler);
-            getPhone().unregisterForDisconnect(mHandler);
+            if (getPhone() != null) {
+                getPhone().unregisterForPreciseCallStateChanged(mHandler);
+                getPhone().unregisterForRingbackTone(mHandler);
+                getPhone().unregisterForHandoverStateChanged(mHandler);
+                getPhone().unregisterForDisconnect(mHandler);
+            }
+            mOriginalConnection.removePostDialListener(mPostDialListener);
+            mOriginalConnection.removeListener(mOriginalConnectionListener);
             mOriginalConnection = null;
         }
     }
@@ -809,12 +813,7 @@
 
     private void close() {
         Log.v(this, "close");
-        if (getPhone() != null) {
-            getPhone().unregisterForPreciseCallStateChanged(mHandler);
-            getPhone().unregisterForRingbackTone(mHandler);
-            getPhone().unregisterForHandoverStateChanged(mHandler);
-        }
-        mOriginalConnection = null;
+        clearOriginalConnection();
         destroy();
     }