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

Commit 70523ec5 authored by Jinsuk Kim's avatar Jinsuk Kim Committed by android-build-merger
Browse files

am f23829d6: Merge "CEC: Switch active input after routing control" into... 

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

* commit '748e813e':
  CEC: Switch active input after routing control
parents 24c33d32 748e813e

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

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


    private void handleReportPowerStatus(int devicePowerStatus) {

        if (isPowerOnOrTransient(getTvPowerStatus())) {

            tv().updateActiveInput(mCurrentRoutingPath, mNotifyInputChange);

            if (isPowerOnOrTransient(devicePowerStatus)) {

                sendSetStreamPath();

            } else {

                tv().updateActiveInput(mCurrentRoutingPath, mNotifyInputChange);

            }

        }

        finishWithCallback(HdmiControlManager.RESULT_SUCCESS);