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

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

Merge changes Ib0065cc4,I8e35a574 am: 7d47a7d4 am: ff570210 

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



Change-Id: Ide28fdac3334656751c6bee70ccb636f188d8ca7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c174f70f ff570210

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

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




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

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

            mUserUid = 0;

            mUserUid = 0;

            mCallback = null;

            return mHidDeviceNativeInterface.unregisterApp();

            return mHidDeviceNativeInterface.unregisterApp();

        }

        }

        if (DBG) {

        if (DBG) {

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

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

        verify(mHidDeviceNativeInterface).unregisterApp();





        mHidDeviceService.onApplicationStateChangedFromNative(mTestDevice, false);

        mHidDeviceService.onApplicationStateChangedFromNative(mTestDevice, false);

        verifyCallback(TIMEOUT_MS, CALLBACK_APP_UNREGISTERED, mCallbackQueue);

        Assert.assertThrows(

                AssertionError.class,

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

        );



    }

    }

}
 
}

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+10 −3
Original line number Original line Diff line number Diff line
@@ -2852,11 +2852,18 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
            sendBluetoothStateCallback(isUp);

            sendBluetoothStateCallback(isUp);

            sendBleStateChanged(prevState, newState);

            sendBleStateChanged(prevState, newState);





        } else if (newState == BluetoothAdapter.STATE_BLE_TURNING_ON

        } else if (newState == BluetoothAdapter.STATE_BLE_TURNING_ON) {

                || newState == BluetoothAdapter.STATE_BLE_TURNING_OFF) {

            sendBleStateChanged(prevState, newState);

            sendBleStateChanged(prevState, newState);

            isStandardBroadcast = false;

            isStandardBroadcast = false;



        } else if (newState == BluetoothAdapter.STATE_BLE_TURNING_OFF) {

            sendBleStateChanged(prevState, newState);

            if (prevState != BluetoothAdapter.STATE_TURNING_OFF) {

                isStandardBroadcast = false;

            } else {

                // Broadcast as STATE_OFF for app that do not receive BLE update

                newState = BluetoothAdapter.STATE_OFF;

                sendBrEdrDownCallback(mContext.getAttributionSource());

            }

        } else if (newState == BluetoothAdapter.STATE_TURNING_ON

        } else if (newState == BluetoothAdapter.STATE_TURNING_ON

                || newState == BluetoothAdapter.STATE_TURNING_OFF) {

                || newState == BluetoothAdapter.STATE_TURNING_OFF) {

            sendBleStateChanged(prevState, newState);

            sendBleStateChanged(prevState, newState);