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

Commit 14082f37 authored by Yara Hassan's avatar Yara Hassan Committed by Automerger Merge Worker
Browse files

Merge "Fix bluetooth test broken by Service change" into rvc-dev am: 97d53d3f 

Change-Id: Idd20150a05db76b28919610a3ae8864fe71beacc
parents dbf1c569 97d53d3f

tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+2 −1
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ public class AdapterServiceTest { 
    private @Mock IBluetoothCallback mIBluetoothCallback;

    private @Mock Binder mBinder;

    private @Mock AudioManager mAudioManager;

    private @Mock android.app.Application mApplication;



    private static final int CONTEXT_SWITCH_MS = 100;

    private static final int ONE_SECOND_MS = 1000;
@@ -162,7 +163,7 @@ public class AdapterServiceTest { 
        when(mMockService2.getName()).thenReturn("Service2");



        // Attach a context to the service for permission checks.

        mAdapterService.attach(mMockContext, null, null, null, null, null);

        mAdapterService.attach(mMockContext, null, null, null, mApplication, null);



        mAdapterService.onCreate();

        mServiceBinder.registerCallback(mIBluetoothCallback);