commit 998787ffa8f8cda53361d65b0a7688f8b1feb6d8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jul 26 18:01:59 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 26 18:01:59 2024 +0000
tree fbe352905d4ccaae99bdd6ba2d949a316639d6a4
parent cff856a8bbdab378632e18956a2d48a70e013e57
parent c7adef9634576983b37526cf14dca709ba4b506a

Merge "Make adb team OWNERS of all Adb settings" 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