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

Commit 113ac810 authored by timhypeng's avatar timhypeng
Browse files

Display "pair new" only when local output device is available. 

-If media app does not support cast->phone transferring, local output
audio device is unavailable. "pair new" is for Bluetooth which should be
also unavilable.
-These types are local output audio devices:
TYPE_BUILTIN_SPEAKER
TYPE_WIRED_HEADSET
TYPE_WIRED_HEADPHONES
TYPE_USB_DEVICE
TYPE_USB_HEADSET
TYPE_USB_ACCESSORY
TYPE_DOCK
TYPE_HDMI

Bug: 163095048
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib844c7546e1946cb87fac04cb8b2b8f4acf06451
parent f58fcb21

src/com/android/settings/media/MediaOutputSlice.java

+8 −3
Original line number Diff line number Diff line
@@ -106,10 +106,15 @@ public class MediaOutputSlice implements CustomSliceable { 
            final MediaDevice connectedDevice = worker.getCurrentConnectedMediaDevice();

            if (devices.size() == 1) {

                // Zero state

                for (MediaDevice device : devices) {

                final MediaDevice device = devices.iterator().next();

                addRow(device, device, listBuilder);

                }

                // Add "pair new" only when local output device exists

                final int type = device.getDeviceType();

                if (type == MediaDevice.MediaDeviceType.TYPE_PHONE_DEVICE

                        || type == MediaDevice.MediaDeviceType.TYPE_3POINT5_MM_AUDIO_DEVICE

                        || type == MediaDevice.MediaDeviceType.TYPE_USB_C_AUDIO_DEVICE) {

                    listBuilder.addRow(getPairNewRow());

                }

            } else {

                final boolean isTouched = worker.getIsTouched();

                // Fix the last top device when user press device to transfer.