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

Commit 89d9b2f5 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Start HOME activity only if we are not on it yet"

parents e1553a9e 2d8f4e6e

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

+4 −1
Original line number Diff line number Diff line
@@ -1150,7 +1150,10 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        }

        // Wake up if the current device if ready to route.

        mService.wakeUp();

        if (portId == Constants.CEC_SWITCH_HOME && mService.isPlaybackDevice()) {

        // Switch to HOME if the current active port is not HOME yet

        if (portId == Constants.CEC_SWITCH_HOME

            && mService.isPlaybackDevice()

            && getLocalActivePort() != Constants.CEC_SWITCH_HOME) {

            switchToHomeTvInput();

        } else if (portId == Constants.CEC_SWITCH_ARC) {

            switchToTvInput(SystemProperties.get(Constants.PROPERTY_SYSTEM_AUDIO_DEVICE_ARC_PORT));