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

Commit bc28c578 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Not handling portSelect and deviceSelect when device is standby""

parents 9f8aa1d7 98dc35c2

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

+0 −10
Original line number Diff line number Diff line
@@ -1680,11 +1680,6 @@ public class HdmiControlService extends SystemService { 
                        Slog.e(TAG, "Callback cannot be null");

                        return;

                    }

                    if (isPowerStandby()) {

                        Slog.e(TAG, "Device is in standby. Not handling deviceSelect");

                        invokeCallback(callback, HdmiControlManager.RESULT_INCORRECT_MODE);

                        return;

                    }

                    HdmiCecLocalDeviceTv tv = tv();

                    if (tv == null) {

                        if (!mAddressAllocated) {
@@ -1727,11 +1722,6 @@ public class HdmiControlService extends SystemService { 
                        Slog.e(TAG, "Callback cannot be null");

                        return;

                    }

                    if (isPowerStandby()) {

                        Slog.e(TAG, "Device is in standby. Not handling portSelect");

                        invokeCallback(callback, HdmiControlManager.RESULT_INCORRECT_MODE);

                        return;

                    }

                    HdmiCecLocalDeviceTv tv = tv();

                    if (tv != null) {

                        tv.doManualPortSwitching(portId, callback);