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

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

Merge "Use up-to-date power status in DeviceSelectAction" into sc-dev am: c304c162 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea5ebb1d92dcc7b7baea234b89d0aaba7fcd049d
parents 96941c88 c304c162

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

+4 −3
Original line number Diff line number Diff line
@@ -103,10 +103,11 @@ final class DeviceSelectAction extends HdmiCecFeatureAction { 
        if (mIsCec20) {

            sendSetStreamPath();

        }

        if (!mIsCec20 || mTarget.getDevicePowerStatus()

                              == HdmiControlManager.POWER_STATUS_UNKNOWN) {

        int targetPowerStatus = localDevice().mService.getHdmiCecNetwork()

                .getCecDeviceInfo(getTargetAddress()).getDevicePowerStatus();

        if (!mIsCec20 || targetPowerStatus == HdmiControlManager.POWER_STATUS_UNKNOWN) {

            queryDevicePowerStatus();

        } else if (mTarget.getDevicePowerStatus() == HdmiControlManager.POWER_STATUS_ON) {

        } else if (targetPowerStatus == HdmiControlManager.POWER_STATUS_ON) {

            invokeCallbackAndFinish(HdmiControlManager.RESULT_SUCCESS);

            return true;

        }