Merge "Make bluetooth toggle be on when Bluetooth is turning on" into main

2023-10-10 07:16:05 +00:00
parent 0730b167c9 8d0c67408e
commit a0230b9ba0
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
+++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
@@ -124,7 +124,8 @@ public class BluetoothSliceBuilder {

    private static boolean isBluetoothEnabled() {
        final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        return adapter.isEnabled();
+        return adapter.getState() == BluetoothAdapter.STATE_ON
+                || adapter.getState() == BluetoothAdapter.STATE_TURNING_ON;
    }

    private static PendingIntent getPrimaryAction(Context context) {