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/OtaUtils.java

diff --git a/src/com/android/phone/OtaUtils.java b/src/com/android/phone/OtaUtils.java
index c4b0d19..775b253 100644
--- a/src/com/android/phone/OtaUtils.java
+++ b/src/com/android/phone/OtaUtils.java
@@ -162,9 +162,6 @@
     // an InCallScreen or CallCard or any OTASP UI elements at all.
     private boolean mInteractive = true;
 
-    // used when setting speakerphone
-    private final BluetoothManager mBluetoothManager;
-
     /**
      * OtaWidgetData class represent all OTA UI elements
      *
@@ -209,12 +206,11 @@
      * Note if interactive is true, you must also call updateUiWidgets() as soon
      * as the InCallScreen instance is ready.
      */
-    public OtaUtils(Context context, boolean interactive, BluetoothManager bluetoothManager) {
+    public OtaUtils(Context context, boolean interactive) {
         if (DBG) log("OtaUtils constructor...");
         mApplication = PhoneGlobals.getInstance();
         mContext = context;
         mInteractive = interactive;
-        mBluetoothManager = bluetoothManager;
     }
 
     /**
@@ -385,8 +381,7 @@
         }
 
         // Create the OtaUtils instance.
-        app.otaUtils = new OtaUtils(context, false /* non-interactive mode */,
-                app.getBluetoothManager());
+        app.otaUtils = new OtaUtils(context, false /* non-interactive mode */);
         if (DBG) log("- created OtaUtils: " + app.otaUtils);
 
         // ... and kick off the OTASP call.
@@ -501,8 +496,7 @@
         }
 
         // Create the OtaUtils instance.
-        app.otaUtils = new OtaUtils(app.getApplicationContext(), true /* interactive */,
-                app.getBluetoothManager());
+        app.otaUtils = new OtaUtils(app.getApplicationContext(), true /* interactive */);
         if (DBG) log("- created OtaUtils: " + app.otaUtils);
 
         // NOTE we still need to call OtaUtils.updateUiWidgets() once the
@@ -560,10 +554,6 @@
             return;
         }
 
-        if (state && mBluetoothManager.isBluetoothAvailable()
-                && mBluetoothManager.isBluetoothAudioConnected()) {
-            mBluetoothManager.disconnectBluetoothAudio();
-        }
         PhoneUtils.turnOnSpeaker(mContext, state, true);
     }