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

Commit 42ef6ff5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use a non-null package name when creating a ComponentName" into tm-dev... 

Merge "Use a non-null package name when creating a ComponentName" into tm-dev am: ad9848b2 am: 2d4460ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18140303



Change-Id: I1f999b10917909674e714f417be458b758462ce8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71659b18 2d4460ed

android/app/tests/unit/src/com/android/bluetooth/hfpclient/connserv/HfpClientDeviceBlockTest.java

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ public class HfpClientDeviceBlockTest { 
    private static final String TEST_DEVICE_ADDRESS = "00:11:22:33:44:55";

    private static final String TEST_NUMBER = "000-111-2222";

    private static final String KEY_SCO_STATE = "com.android.bluetooth.hfpclient.SCO_STATE";

    private static final String TEST_PACKAGE = "test";



    @Mock

    private HeadsetClientService mHeadsetClientService;
@@ -76,6 +77,7 @@ public class HfpClientDeviceBlockTest { 
                        .hfp_client_connection_service_support_emergency_call)).thenReturn(true);

        when(mApplicationContext.getResources()).thenReturn(mResources);

        when(mConnServ.getApplicationContext()).thenReturn(mApplicationContext);

        when(mConnServ.getPackageName()).thenReturn(TEST_PACKAGE);



        when(mConnServ.getSystemService(Context.TELECOM_SERVICE)).thenReturn(mTelecomManager);

        when(mConnServ.getSystemServiceName(TelecomManager.class))