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>
This commit is contained in:
Yuanru Qian
2024-07-25 04:29:10 +00:00
committed by Automerger Merge Worker

View File

@@ -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