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

Commit f8d2f328 authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Android Git Automerger
Browse files

am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 

* commit 'f23829d6':
  CEC: Switch active input after routing control
parents 8781dbf3 f23829d6

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -119,10 +119,9 @@ final class RoutingControlAction extends HdmiCecFeatureAction { 




    private void handleReportPowerStatus(int devicePowerStatus) {

    private void handleReportPowerStatus(int devicePowerStatus) {

        if (isPowerOnOrTransient(getTvPowerStatus())) {

        if (isPowerOnOrTransient(getTvPowerStatus())) {

            tv().updateActiveInput(mCurrentRoutingPath, mNotifyInputChange);

            if (isPowerOnOrTransient(devicePowerStatus)) {

            if (isPowerOnOrTransient(devicePowerStatus)) {

                sendSetStreamPath();

                sendSetStreamPath();

            } else {

                tv().updateActiveInput(mCurrentRoutingPath, mNotifyInputChange);

            }

            }

        }

        }

        finishWithCallback(HdmiControlManager.RESULT_SUCCESS);

        finishWithCallback(HdmiControlManager.RESULT_SUCCESS);