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

Commit cf5a68ed authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypicker-L95100000958232375:N14700001329291186"... 

Merge changes from topic "cherrypicker-L95100000958232375:N14700001329291186" into tm-qpr-dev am: ee690a73

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



Change-Id: I42a35678a437ed3062beb3bbbe20358ded3c35c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79b384e6 ee690a73

android/app/src/com/android/bluetooth/hid/HidDeviceService.java

+1 −0
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ public class HidDeviceService extends ProfileService { 


        if (mUserUid != 0 && (uid == mUserUid || uid < Process.FIRST_APPLICATION_UID)) {

            mUserUid = 0;

            mCallback = null;

            return mHidDeviceNativeInterface.unregisterApp();

        }

        if (DBG) {

android/app/tests/unit/src/com/android/bluetooth/hid/HidDeviceTest.java

+5 −1
Original line number Diff line number Diff line
@@ -528,6 +528,10 @@ public class HidDeviceTest { 
        verify(mHidDeviceNativeInterface).unregisterApp();



        mHidDeviceService.onApplicationStateChangedFromNative(mTestDevice, false);

        verifyCallback(TIMEOUT_MS, CALLBACK_APP_UNREGISTERED, mCallbackQueue);

        Assert.assertThrows(

                AssertionError.class,

                () -> verifyCallback(TIMEOUT_MS, CALLBACK_APP_UNREGISTERED, mCallbackQueue)

        );



    }

}