Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00493576 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use the systemService for Bluetooth"

parents 77a8b884 fe0fd900

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

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ public class TelecomSystem { 
                        }

                    });

            BluetoothDeviceManager bluetoothDeviceManager = new BluetoothDeviceManager(mContext,

                    new BluetoothManager(mContext).getAdapter());

                    mContext.getSystemService(BluetoothManager.class).getAdapter());

            BluetoothRouteManager bluetoothRouteManager = new BluetoothRouteManager(mContext, mLock,

                    bluetoothDeviceManager, new Timeouts.Adapter());

            BluetoothStateReceiver bluetoothStateReceiver = new BluetoothStateReceiver(

tests/src/com/android/server/telecom/tests/TelecomSystemTest.java

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.app.AppOpsManager;

import android.bluetooth.BluetoothManager;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentResolver;
@@ -348,6 +349,7 @@ public class TelecomSystemTest extends TelecomTestCase { 
        doNothing().when(mSpyContext).sendBroadcastAsUser(any(), any(), any());



        doReturn(mock(AppOpsManager.class)).when(mSpyContext).getSystemService(AppOpsManager.class);

        doReturn(mock(BluetoothManager.class)).when(mSpyContext).getSystemService(BluetoothManager.class);



        mHandlerThread = new HandlerThread("TelecomHandlerThread");

        mHandlerThread.start();