diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-08-05 09:31:32 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-08-05 09:31:32 +0000 |
| commit | 5d50423619d82692d75c33e2ba83793f8a431210 (patch) | |
| tree | 780e01a6191ea0e472ecf04e7fb0c6089e54d0ce | |
| parent | c218052dbe344ba787a6af685d2baf443672fad0 (diff) | |
| parent | 6e134dc065caa4756884cf3138917d8f5b54f717 (diff) | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28471034'] into udc-platform-release.
Change-Id: Id6dca12670004eb6c054beb7d2bbcc0543e5f3f2
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java index 1728e405fa29..362267c75716 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java @@ -576,6 +576,10 @@ public class InfoMediaManager extends MediaManager { case TYPE_HEARING_AID: case TYPE_BLUETOOTH_A2DP: case TYPE_BLE_HEADSET: + if (route.getAddress() == null) { + Log.e(TAG, "Ignoring bluetooth route with no set address: " + route); + break; + } final BluetoothDevice device = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(route.getAddress()); final CachedBluetoothDevice cachedDevice = |