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

Commit 79b384e6 authored by Animesh Fatehpuria's avatar Animesh Fatehpuria Committed by Automerger Merge Worker
Browse files

Fix BT Query Routing Issue am: 5bee68ce 

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



Change-Id: Ifa2eead6bf0ba3fc8330e0d13b744b7f9378afcf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bdb1d9e4 5bee68ce

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

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

            sendBleStateChanged(prevState, newState);



        } else if (newState == BluetoothAdapter.STATE_BLE_TURNING_ON

                || newState == BluetoothAdapter.STATE_BLE_TURNING_OFF) {

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

            sendBleStateChanged(prevState, newState);

            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

                || newState == BluetoothAdapter.STATE_TURNING_OFF) {

            sendBleStateChanged(prevState, newState);