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

Commit d993ad16 authored by Nathalie Le Clair's avatar Nathalie Le Clair Committed by Automerger Merge Worker
Browse files

Merge "Playback device to not send <Inactive Source> before <Standby>" into sc-dev am: 6fe7de2e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13969747

Change-Id: I659c7515d6773767801d356f0808b87818619627
parents 150ba859 6fe7de2e

services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java

+4 −5
Original line number Diff line number Diff line
@@ -136,12 +136,8 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
        if (!mService.isControlEnabled()) {

            return;

        }

        if (isActiveSource()) {

            mService.sendCecCommand(HdmiCecMessageBuilder.buildInactiveSource(

                    mAddress, mService.getPhysicalAddress()));

        }

        boolean wasActiveSource = isActiveSource();

        // Invalidate the internal active source record when goes to standby

        // Invalidate the internal active source record when going to standby

        mService.setActiveSource(Constants.ADDR_INVALID, Constants.INVALID_PHYSICAL_ADDRESS,

                "HdmiCecLocalDevicePlayback#onStandby()");

        boolean mTvSendStandbyOnSleep = mService.getHdmiCecConfig().getIntValue(
@@ -167,6 +163,9 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
                                        Constants.ADDR_BROADCAST));

                        break;

                    case HdmiControlManager.POWER_CONTROL_MODE_NONE:

                        mService.sendCecCommand(

                                HdmiCecMessageBuilder.buildInactiveSource(mAddress,

                                        mService.getPhysicalAddress()));

                        break;

                }

                break;

services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java

+18 −0
Original line number Diff line number Diff line
@@ -699,9 +699,12 @@ public class HdmiCecLocalDevicePlaybackTest { 
                mHdmiCecLocalDevicePlayback.mAddress, ADDR_TV);

        HdmiCecMessage standbyMessageBroadcast = HdmiCecMessageBuilder.buildStandby(

                mHdmiCecLocalDevicePlayback.mAddress, ADDR_BROADCAST);

        HdmiCecMessage inactiveSource = HdmiCecMessageBuilder.buildInactiveSource(

                mPlaybackLogicalAddress, mPlaybackPhysicalAddress);



        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(standbyMessageToTv);

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(standbyMessageBroadcast);

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(inactiveSource);

    }



    @Test
@@ -721,9 +724,12 @@ public class HdmiCecLocalDevicePlaybackTest { 
                mHdmiCecLocalDevicePlayback.mAddress, ADDR_TV);

        HdmiCecMessage standbyMessageBroadcast = HdmiCecMessageBuilder.buildStandby(

                mHdmiCecLocalDevicePlayback.mAddress, ADDR_BROADCAST);

        HdmiCecMessage inactiveSource = HdmiCecMessageBuilder.buildInactiveSource(

                mPlaybackLogicalAddress, mPlaybackPhysicalAddress);



        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(standbyMessageToTv);

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(standbyMessageBroadcast);

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(inactiveSource);

    }



    @Test
@@ -743,9 +749,12 @@ public class HdmiCecLocalDevicePlaybackTest { 
                mHdmiCecLocalDevicePlayback.mAddress, ADDR_TV);

        HdmiCecMessage standbyMessageBroadcast = HdmiCecMessageBuilder.buildStandby(

                mHdmiCecLocalDevicePlayback.mAddress, ADDR_BROADCAST);

        HdmiCecMessage inactiveSource = HdmiCecMessageBuilder.buildInactiveSource(

                mPlaybackLogicalAddress, mPlaybackPhysicalAddress);



        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(standbyMessageToTv);

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(standbyMessageBroadcast);

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(inactiveSource);

    }



    @Test
@@ -765,9 +774,12 @@ public class HdmiCecLocalDevicePlaybackTest { 
                mHdmiCecLocalDevicePlayback.mAddress, ADDR_TV);

        HdmiCecMessage standbyMessageBroadcast = HdmiCecMessageBuilder.buildStandby(

                mHdmiCecLocalDevicePlayback.mAddress, ADDR_BROADCAST);

        HdmiCecMessage inactiveSource = HdmiCecMessageBuilder.buildInactiveSource(

                mPlaybackLogicalAddress, mPlaybackPhysicalAddress);



        assertThat(mNativeWrapper.getResultMessages()).contains(standbyMessageToTv);

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(standbyMessageBroadcast);

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(inactiveSource);

    }



    @Test
@@ -787,9 +799,12 @@ public class HdmiCecLocalDevicePlaybackTest { 
                mHdmiCecLocalDevicePlayback.mAddress, ADDR_TV);

        HdmiCecMessage standbyMessageBroadcast = HdmiCecMessageBuilder.buildStandby(

                mHdmiCecLocalDevicePlayback.mAddress, ADDR_BROADCAST);

        HdmiCecMessage inactiveSource = HdmiCecMessageBuilder.buildInactiveSource(

                mPlaybackLogicalAddress, mPlaybackPhysicalAddress);



        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(standbyMessageToTv);

        assertThat(mNativeWrapper.getResultMessages()).contains(standbyMessageBroadcast);

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(inactiveSource);

    }



    @Test
@@ -809,9 +824,12 @@ public class HdmiCecLocalDevicePlaybackTest { 
                mHdmiCecLocalDevicePlayback.mAddress, ADDR_TV);

        HdmiCecMessage standbyMessageBroadcast = HdmiCecMessageBuilder.buildStandby(

                mHdmiCecLocalDevicePlayback.mAddress, ADDR_BROADCAST);

        HdmiCecMessage inactiveSource = HdmiCecMessageBuilder.buildInactiveSource(

                mPlaybackLogicalAddress, mPlaybackPhysicalAddress);



        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(standbyMessageToTv);

        assertThat(mNativeWrapper.getResultMessages()).doesNotContain(standbyMessageBroadcast);

        assertThat(mNativeWrapper.getResultMessages()).contains(inactiveSource);

    }



    @Test