commit cff856a8bbdab378632e18956a2d48a70e013e57
author Yuanru Qian <yqian@google.com> Thu Jul 25 03:31:43 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 25 03:31:43 2024 +0000
tree d13e07d283c0db0354a5478f3e8fef3b13eabb86
parent 8303a38d107ca21708f3af7e4ca3ab832c28f587
parent ec6e93f3f46e66d6ecfa8ed58b644b8ccf9e156d

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

src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java

diff --git a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
index a1467c8..467a8ca 100644
--- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
@@ -45,9 +45,10 @@
         super(context);
 
         final BluetoothManager bluetoothManager = context.getSystemService(BluetoothManager.class);
-
-        mDefaultMaxConnectedAudioDevices =
-              bluetoothManager.getAdapter().getMaxConnectedAudioDevices();
+        if(bluetoothManager != null && bluetoothManager.getAdapter() != null) {
+            mDefaultMaxConnectedAudioDevices =
+                bluetoothManager.getAdapter().getMaxConnectedAudioDevices();
+        }
     }
 
     @Override