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

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

Merge "Revert "Unregister callback on unregisterAppUid."" into tm-qpr-dev am: 59997cae 

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



Change-Id: Ib7d05de358f504ad5a535f536ebf49604b77f046
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dde4c846 59997cae

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

+0 −1
Original line number Diff line number Diff line
@@ -620,7 +620,6 @@ 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

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



        mHidDeviceService.onApplicationStateChangedFromNative(mTestDevice, false);

        Assert.assertThrows(

                AssertionError.class,

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

        );



        verifyCallback(TIMEOUT_MS, CALLBACK_APP_UNREGISTERED, mCallbackQueue);

    }

}