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

Commit 696e95fb authored by Marvin Ramin's avatar Marvin Ramin
Browse files

Fix ignored HdmiCecLocalDevicePlaybackTest 

Bug: 120845532
Test: atest HdmiCecLocalDevicePlaybackTest
Change-Id: Ieb3071a02440ac9ad9524bb4ffec63899fd615d3
parent fe03f74e

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

+0 −15
Original line number Diff line number Diff line
@@ -58,11 +58,6 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
    // If true, turn off TV upon standby. False by default.

    private boolean mAutoTvOff;



    // Local active port number used for Routing Control.

    // Default 0 means HOME is the current active path. Temp solution only.

    // TODO(amyjojo): adding system constants for input ports to TIF mapping.

    private int mLocalActivePath = 0;



    // Determines what action should be taken upon receiving Routing Control messages.

    @VisibleForTesting

    protected HdmiProperties.playback_device_action_on_routing_control_values
@@ -438,16 +433,6 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
        checkIfPendingActionsCleared();

    }



    private void routeToPort(int portId) {

        // TODO(AMYJOJO): route to specific input of the port

        mLocalActivePath = portId;

    }



    @VisibleForTesting

    protected int getLocalActivePath() {

        return mLocalActivePath;

    }



    @Override

    protected void dump(final IndentingPrintWriter pw) {

        super.dump(pw);

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

+1 −7
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import androidx.test.InstrumentationRegistry; 
import androidx.test.filters.SmallTest;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;
@@ -370,16 +369,11 @@ public class HdmiCecLocalDevicePlaybackTest { 
        assertThat(mStandby).isFalse();

    }



    // Playback device does not handle routing control related feature right now

    @Ignore("b/120845532")

    @Test

    public void handleSetStreamPath_underCurrentDevice() {

        assertThat(mHdmiCecLocalDevicePlayback.getLocalActivePath()).isEqualTo(0);

    public void handleSetStreamPath() {

        HdmiCecMessage message =

                HdmiCecMessageBuilder.buildSetStreamPath(ADDR_TV, 0x2100);

        assertThat(mHdmiCecLocalDevicePlayback.handleSetStreamPath(message)).isTrue();

        // TODO(amyjojo): Move set and get LocalActivePath to Control Service.

        assertThat(mHdmiCecLocalDevicePlayback.getLocalActivePath()).isEqualTo(1);

    }



    @Test