commit 5ccda616708b298d6f71598b6ac23a94cd6033f8
author Bryce Lee <brycelee@google.com> Fri Dec 04 15:44:16 2015 -0800
committer Bryce Lee <brycelee@google.com> Fri Dec 04 15:44:16 2015 -0800
tree 6ee43e8670fad282a1261fd295d92947ac405d7a
parent 71834c4da42e31603e37db8d11744e990e0b4598

Remove BluetoothManager.

Bug: 25851538
Change-Id: I40cbd1fc5c26fb61bdf815a5ecc044197d887a0e

src/com/android/phone/CallNotifier.java

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 2b7d2ff..fc583c4 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -114,7 +114,6 @@
 
     // Cached AudioManager
     private AudioManager mAudioManager;
-    private final BluetoothManager mBluetoothManager;
     private SubscriptionManager mSubscriptionManager;
     private TelephonyManager mTelephonyManager;
 
@@ -125,11 +124,10 @@
     /* package */ static CallNotifier init(
             PhoneGlobals app,
             CallLogger callLogger,
-            CallStateMonitor callStateMonitor,
-            BluetoothManager bluetoothManager) {
+            CallStateMonitor callStateMonitor) {
         synchronized (CallNotifier.class) {
             if (sInstance == null) {
-                sInstance = new CallNotifier(app, callLogger, callStateMonitor, bluetoothManager);
+                sInstance = new CallNotifier(app, callLogger, callStateMonitor);
             } else {
                 Log.wtf(LOG_TAG, "init() called multiple times!  sInstance = " + sInstance);
             }
@@ -141,12 +139,10 @@
     private CallNotifier(
             PhoneGlobals app,
             CallLogger callLogger,
-            CallStateMonitor callStateMonitor,
-            BluetoothManager bluetoothManager) {
+            CallStateMonitor callStateMonitor) {
         mApplication = app;
         mCM = app.mCM;
         mCallLogger = callLogger;
-        mBluetoothManager = bluetoothManager;
 
         mAudioManager = (AudioManager) mApplication.getSystemService(Context.AUDIO_SERVICE);
         mTelephonyManager =
@@ -458,13 +454,6 @@
             mPreviousCdmaCallState = fgPhone.getForegroundCall().getState();
         }
 
-        // Have the PhoneApp recompute its mShowBluetoothIndication
-        // flag based on the (new) telephony state.
-        // There's no need to force a UI update since we update the
-        // in-call notification ourselves (below), and the InCallScreen
-        // listens for phone state changes itself.
-        mBluetoothManager.updateBluetoothIndication();
-
         // Update the phone state and other sensor/lock.
         mApplication.updatePhoneState(state);