commit 7948f5b5aeae8e508ee4310595669c484c786dd7
author Hall Liu <hallliu@google.com> Tue Mar 15 17:39:28 2016 -0700
committer Hall Liu <hallliu@google.com> Tue Mar 15 17:39:28 2016 -0700
tree 0320eacd8ca4d07ccd5bff14bf8cdd8cd6a1e883
parent ddad9e0dc5671c51e0cb35151c84e0a26e5e092a

Fix tests breaking when bluetooth is on

BluetoothPhoneServiceImpl now uses a BluetoothAdapterProxy so that it is
now isolated from system bluetooth.

Bug: 27686250
Change-Id: If27c9ba642b163ecde68ae8956bc76523a552d31

src/com/android/server/telecom/BluetoothPhoneServiceImpl.java

diff --git a/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java b/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
index 6680eb6..33ca531 100644
--- a/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
+++ b/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
@@ -401,7 +401,7 @@
         }
     };
 
-    private BluetoothAdapter mBluetoothAdapter;
+    private BluetoothAdapterProxy mBluetoothAdapter;
     private BluetoothHeadsetProxy mBluetoothHeadset;
 
     // A map from Calls to indexes used to identify calls for CLCC (C* List Current Calls).
@@ -422,6 +422,7 @@
             Context context,
             TelecomSystem.SyncRoot lock,
             CallsManager callsManager,
+            BluetoothAdapterProxy bluetoothAdapter,
             PhoneAccountRegistrar phoneAccountRegistrar) {
         Log.d(this, "onCreate");
 
@@ -430,7 +431,7 @@
         mCallsManager = callsManager;
         mPhoneAccountRegistrar = phoneAccountRegistrar;
 
-        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        mBluetoothAdapter = bluetoothAdapter;
         if (mBluetoothAdapter == null) {
             Log.d(this, "BluetoothPhoneService shutting down, no BT Adapter found.");
             return;