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

Commit 8de57130 authored by Jeremy Wu's avatar Jeremy Wu
Browse files

MediaRoute: handle null address in getTransferActionForRoute

Bug: 435515063
Test: m
Flag:com.android.media.flags.enable_device_address_as_identifier_in_media_router_2
Change-Id: I1d94df6460d367102ad221df8273f2658f93c5e9
parent 42bdf1c4
Loading
Loading
Loading
Loading
+10 −5
Original line number Diff line number Diff line
@@ -447,9 +447,14 @@ import java.util.concurrent.CopyOnWriteArrayList;
            };

        } else {
            String deviceAddress =
                    com.android.media.flags.Flags.enableDeviceAddressAsIdentifierInMediaRouter2()
                            ? mediaRoute2InfoHolder.mMediaRoute2Info.getAddress() : "";
            String deviceAddress = "";

            if (com.android.media.flags.Flags.enableDeviceAddressAsIdentifierInMediaRouter2()) {
                deviceAddress = mediaRoute2InfoHolder.mMediaRoute2Info.getAddress();
                if (deviceAddress == null) {
                    deviceAddress = "";
                }
            }

            AudioDeviceAttributes deviceAttributes =
                    new AudioDeviceAttributes(
@@ -696,7 +701,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
                        currentOutputIsBLEBroadcast ? mSelectedRoutes : Collections.emptyList();

                if (currentOutputIsBLEBroadcast
                        || mSelectedRoutes.getFirst().getType()
                        || mSelectedRoutes.get(0).getType()
                                != MediaRoute2Info.TYPE_BLE_HEADSET) {
                    mSelectableRoutes = Collections.emptyList();
                } else {
@@ -825,7 +830,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
        List<AudioDeviceAttributes> devicesForMedia =
                mAudioManager.getDevicesForAttributes(MEDIA_USAGE_AUDIO_ATTRIBUTES);
        return !devicesForMedia.isEmpty()
                && devicesForMedia.getFirst().getType() == AudioDeviceInfo.TYPE_BLE_BROADCAST;
                && devicesForMedia.get(0).getType() == AudioDeviceInfo.TYPE_BLE_BROADCAST;
    }

    /**