From 8d0c67408e4f9ba528521f4328b3be148b59c099 Mon Sep 17 00:00:00 2001 From: Haijie Hong Date: Tue, 10 Oct 2023 13:34:23 +0800 Subject: [PATCH] Make bluetooth toggle be on when Bluetooth is turning on The logic should be similar to the Wi-Fi one: https://android.googlesource.com/platform/packages/apps/Settings/+/refs/heads/main/src/com/android/settings/wifi/slice/WifiSlice.java#379 BUG: 293264131 Test: unit test Change-Id: I1222f9f793b91d81d74ed9358f1b055d3049866e --- src/com/android/settings/bluetooth/BluetoothSliceBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java index 508084d2b6b..fd8ef1fd82a 100644 --- 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) {