Merge "Developer option crashed when Bluetooth feature disabled" into main

2024-07-25 03:31:43 +00:00
parent 8303a38d10 ec6e93f3f4
commit cff856a8bb
1 changed files with 4 additions and 3 deletions
--- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
@@ -45,9 +45,10 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceController extends
        super(context);

        final BluetoothManager bluetoothManager = context.getSystemService(BluetoothManager.class);
-
-        mDefaultMaxConnectedAudioDevices =
-              bluetoothManager.getAdapter().getMaxConnectedAudioDevices();
+        if(bluetoothManager != null && bluetoothManager.getAdapter() != null) {
+            mDefaultMaxConnectedAudioDevices =
+                bluetoothManager.getAdapter().getMaxConnectedAudioDevices();
+        }
    }

    @Override