commit 207ec8c2dd1927edb5332afcafacccebfd2ca210
author Santos Cordon <santoscordon@google.com> Tue Jul 14 17:56:29 2015 +0000
committer Santos Cordon <santoscordon@google.com> Tue Jul 14 17:56:29 2015 +0000
tree 127bd6af8e3bf3d93687fc28c0b0922f3a482559
parent a1c961010fc7b370c2ef3a8331680054e588b869

Revert "Add missing unregistrations when a connection ends."

This reverts commit a1c961010fc7b370c2ef3a8331680054e588b869.

Change-Id: Ifee43826b59c63a5e65ae612f4c2d7bd44e22191

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