Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 800ba45f authored by Iván Budnik's avatar Iván Budnik
Browse files

Fix IAE for bluetooth routes without set BT address

This change just adds a last resort check to avoid the exception and fix
the crash. Further checks will be added in the routing framework to avoid
this incongruent state.

Test: atest com.android.settingslib.media and manually with demo app
Bug: 347499404
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ee6d33f4e29fe196c262a3c7051d34ef8f93a62f)
Merged-In: I87e6810467bcae0bac7f0418217b03e57c1d8c03
Change-Id: I87e6810467bcae0bac7f0418217b03e57c1d8c03
parent f82e76ad
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -527,6 +527,10 @@ public abstract 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 =