diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index bc0e584..2b7d2ff 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -206,7 +206,9 @@
 
             case CallStateMonitor.PHONE_DISCONNECT:
                 if (DBG) log("DISCONNECT");
-                onDisconnect((AsyncResult) msg.obj);
+                // Stop any signalInfo tone being played when a call gets ended, the rest of the
+                // disconnect functionality in onDisconnect() is handled in ConnectionService.
+                stopSignalInfoTone();
                 break;
 
             case CallStateMonitor.PHONE_UNKNOWN_CONNECTION_APPEARED:
diff --git a/src/com/android/phone/CallStateMonitor.java b/src/com/android/phone/CallStateMonitor.java
index 16a6f1f..512c30b 100644
--- a/src/com/android/phone/CallStateMonitor.java
+++ b/src/com/android/phone/CallStateMonitor.java
@@ -88,7 +88,7 @@
         //
         //callManager.registerForNewRingingConnection(this, PHONE_NEW_RINGING_CONNECTION, null);
         //callManager.registerForPreciseCallStateChanged(this, PHONE_STATE_CHANGED, null);
-        //callManager.registerForDisconnect(this, PHONE_DISCONNECT, null);
+        callManager.registerForDisconnect(this, PHONE_DISCONNECT, null);
         //callManager.registerForUnknownConnection(this, PHONE_UNKNOWN_CONNECTION_APPEARED, null);
         callManager.registerForCdmaOtaStatusChange(this, EVENT_OTA_PROVISION_CHANGE, null);
         //callManager.registerForCallWaiting(this, PHONE_CDMA_CALL_WAITING, null);
@@ -134,7 +134,7 @@
         // Unregister all events from the old obsolete phone
         //callManager.unregisterForNewRingingConnection(this);
         //callManager.unregisterForPreciseCallStateChanged(this);
-        //callManager.unregisterForDisconnect(this);
+        callManager.unregisterForDisconnect(this);
         //callManager.unregisterForUnknownConnection(this);
         //callManager.unregisterForCallWaiting(this);
         callManager.unregisterForDisplayInfo(this);