| commit | 6190b5eb709ccfbbdb45f0ea59add3a84de86ea0 | [log] [tgz] |
|---|---|---|
| author | Yuanru Qian <yqian@google.com> | Thu Jul 25 04:29:10 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 25 04:29:10 2024 +0000 |
| tree | 847d1cce25c91871c70189197be77fdcdafb3bed | |
| parent | 97f922d60cd28fdfc8d715b67beea8845ab03b59 [diff] | |
| parent | cff856a8bbdab378632e18956a2d48a70e013e57 [diff] |
Merge "Developer option crashed when Bluetooth feature disabled" into main am: cff856a8bb Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3172099 Change-Id: Idaa295aa767f900acc88da42bc838b7081c69504 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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