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

Commit 6ef041d3 authored by Betty Chang's avatar Betty Chang Committed by Android (Google) Code Review
Browse files

Merge "[LE Audio] Add broadcast icon when device is broadcasting but LE device is disconnected"

parents 629f40c2 81ff62f0

src/com/android/settings/notification/MediaVolumePreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceCont 


    @VisibleForTesting

    boolean isSupportEndItem() {

        return getWorker() != null && getWorker().isBroadcastSupported() && isConnectedBLEDevice();

        return getWorker() != null && getWorker().isBroadcastSupported()

                && (getWorker().isDeviceBroadcasting() || isConnectedBLEDevice());

    }



    private boolean isConnectedBLEDevice() {

tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java

+22 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ public class MediaVolumePreferenceControllerTest { 
    @Test

    public void isSupportEndItem_withBleDevice_returnsTrue() {

        doReturn(true).when(sMediaOutputIndicatorWorker).isBroadcastSupported();

        doReturn(false).when(sMediaOutputIndicatorWorker).isDeviceBroadcasting();

        doReturn(mDevice1).when(sMediaOutputIndicatorWorker).getCurrentConnectedMediaDevice();



        assertThat(mController.isSupportEndItem()).isTrue();
@@ -130,14 +131,35 @@ public class MediaVolumePreferenceControllerTest { 
    @Test

    public void isSupportEndItem_withNonBleDevice_returnsFalse() {

        doReturn(true).when(sMediaOutputIndicatorWorker).isBroadcastSupported();

        doReturn(false).when(sMediaOutputIndicatorWorker).isDeviceBroadcasting();

        doReturn(mDevice2).when(sMediaOutputIndicatorWorker).getCurrentConnectedMediaDevice();



        assertThat(mController.isSupportEndItem()).isFalse();

    }



    @Test

    public void isSupportEndItem_deviceIsBroadcastingAndConnectedToNonBleDevice_returnsTrue() {

        doReturn(true).when(sMediaOutputIndicatorWorker).isBroadcastSupported();

        doReturn(true).when(sMediaOutputIndicatorWorker).isDeviceBroadcasting();

        doReturn(mDevice2).when(sMediaOutputIndicatorWorker).getCurrentConnectedMediaDevice();



        assertThat(mController.isSupportEndItem()).isTrue();

    }



    @Test

    public void isSupportEndItem_deviceIsNotBroadcastingAndConnectedToNonBleDevice_returnsFalse() {

        doReturn(true).when(sMediaOutputIndicatorWorker).isBroadcastSupported();

        doReturn(false).when(sMediaOutputIndicatorWorker).isDeviceBroadcasting();

        doReturn(mDevice2).when(sMediaOutputIndicatorWorker).getCurrentConnectedMediaDevice();



        assertThat(mController.isSupportEndItem()).isFalse();

    }





    @Test

    public void getSliceEndItem_NotSupportEndItem_getsNullSliceAction() {

        doReturn(true).when(sMediaOutputIndicatorWorker).isBroadcastSupported();

        doReturn(false).when(sMediaOutputIndicatorWorker).isDeviceBroadcasting();

        doReturn(mDevice2).when(sMediaOutputIndicatorWorker).getCurrentConnectedMediaDevice();



        final SliceAction sliceAction = mController.getSliceEndItem(mContext);