Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-11 13:46:15 +00:00
committed by Android (Google) Code Review
parent 9f8aa1d759 98dc35c200
commit bc28c57884
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -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);