commit 5422a8deb513e4466ec6cc1e640895a6b536fee0
author Santos Cordon <santoscordon@google.com> Fri Sep 12 04:20:56 2014 -0700
committer Santos Cordon <santoscordon@google.com> Fri Sep 12 04:33:12 2014 -0700
tree b4d48b24bdaf638bafc4c43a8af39bb3c16179ae
parent a1b076704083a12bd81472f35070249363ab94f1

Re-add some CallNotifier implementations.

By disabling all listeners to CallStateMonitor, we inadvertently removed
some required functionality, including tones to play as requested by the
radio and messages.

This change allows adding of listeners to CallStateMonitor but comments
out the events which are now listened to by ConnectionService.

Additionally, this change removed all ringer and
direct-to-voicemail-related code in telephony.

Bug: 17466554
Bug: 17414427
Change-Id: I6afce24bb8dc741c896c5b3cb6c944e138886060

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index f66ebce..b2e1332 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -144,7 +144,6 @@
     private CallGatewayManager callGatewayManager;
     private CallStateMonitor callStateMonitor;
     private IBluetoothHeadsetPhone mBluetoothPhone;
-    private Ringer ringer;
 
     static int mDockState = Intent.EXTRA_DOCK_STATE_UNDOCKED;
     static boolean sVoiceCapable = true;
@@ -403,15 +402,13 @@
             // Bluetooth manager
             bluetoothManager = new BluetoothManager();
 
-            ringer = Ringer.init(this, bluetoothManager);
-
             phoneMgr = PhoneInterfaceManager.init(this, phone);
 
             // Create the CallNotifer singleton, which handles
             // asynchronous events from the telephony layer (like
             // launching the incoming-call UI when an incoming call comes
             // in.)
-            notifier = CallNotifier.init(this, phone, ringer, callLogger, callStateMonitor,
+            notifier = CallNotifier.init(this, phone, callLogger, callStateMonitor,
                     bluetoothManager);
 
             // register for ICC status
@@ -436,7 +433,6 @@
             intentFilter.addAction(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
             intentFilter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);
             intentFilter.addAction(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED);
-            intentFilter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
             registerReceiver(mReceiver, intentFilter);
 
             //set the default values for the preferences in the phone.
@@ -503,10 +499,6 @@
         return getInstance().phone;
     }
 
-    Ringer getRinger() {
-        return ringer;
-    }
-
     IBluetoothHeadsetPhone getBluetoothPhoneService() {
         return mBluetoothPhone;
     }
@@ -802,7 +794,6 @@
             clearOtaState();
         }
 
-        ringer.updateRingerContextAfterRadioTechnologyChange(this.phone);
         notifier.updateCallNotifierRegistrationsAfterRadioTechnologyChange();
         callStateMonitor.updateAfterRadioTechnologyChange();
 
@@ -885,12 +876,6 @@
                         Intent.EXTRA_DOCK_STATE_UNDOCKED);
                 if (VDBG) Log.d(LOG_TAG, "ACTION_DOCK_EVENT -> mDockState = " + mDockState);
                 mHandler.sendMessage(mHandler.obtainMessage(EVENT_DOCK_STATE_CHANGED, 0));
-            } else if (action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) {
-                int ringerMode = intent.getIntExtra(AudioManager.EXTRA_RINGER_MODE,
-                        AudioManager.RINGER_MODE_NORMAL);
-                if (ringerMode == AudioManager.RINGER_MODE_SILENT) {
-                    notifier.silenceRinger();
-                }
             }
         }
     }