commit 19f39cfb9d94cc7eac5cdb3446b78ff0df797995
author Roshan Pius <rpius@google.com> Wed Aug 12 10:44:38 2015 -0700
committer Roshan Pius <rpius@google.com> Thu Aug 13 13:10:58 2015 -0700
tree c024e81e136e6f3b1f5dc7831d799b83e59b2fd7
parent c6fff7df87754244afe780e7826277b1649b8f23

Stop signal info tone when call is disconnected.

As a follow up to the CL: ag/545703, re-adding the phone disconnection
event handling in CallStateMonitor so that we can stop any signal tones
that we may have started on a call disconnect in CallNotifier.

BUG: 22834581
Change-Id: I012fe7ca9f5191807f4252db26b423feb4a30524

src/com/android/phone/CallNotifier.java

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:

src/com/android/phone/CallStateMonitor.java

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