commit 352ff6587456f60948648726cf1573a2e595e238
author Santos Cordon <santoscordon@google.com> Fri May 30 01:41:45 2014 -0700
committer Santos Cordon <santoscordon@google.com> Sat May 31 07:56:58 2014 -0700
tree ed5b90aa9119e72807274b64138a2a22c49d3c2d
parent 741dd7a2cbd0414003a6bb60d269606e1a5cdd40

Move headset hook from Telephony to Telecomm. (2/2)

Lots of code deletion of the headset code and old status bar
notification code.

Bug: 15190069
Change-Id: I990110816ec37c168e3646290a538be3cd23be35

src/com/android/phone/CallNotifier.java

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index dcb5567..986c366 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -942,12 +942,7 @@
         // the Incoming Call
         Call ringingCall = mCM.getFirstActiveRingingCall();
         if (ringingCall.getPhone().getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
-            if (PhoneUtils.isRealIncomingCall(ringingCall.getState())) {
-                // Also we need to take off the "In Call" icon from the Notification
-                // area as the Out going Call never got connected
-                if (DBG) log("cancelCallInProgressNotifications()... (onDisconnect)");
-                mApplication.notificationMgr.cancelCallInProgressNotifications();
-            } else {
+            if (!PhoneUtils.isRealIncomingCall(ringingCall.getState())) {
                 if (DBG) log("stopRing()... (onDisconnect)");
                 mRinger.stopRing();
             }
@@ -1036,8 +1031,6 @@
             if (toneToPlay == InCallTonePlayer.TONE_NONE) {
                 resetAudioStateAfterDisconnect();
             }
-
-            mApplication.notificationMgr.cancelCallInProgressNotifications();
         }
 
         if (c != null) {