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

This reverts commit a9d5ca2f0c.

Bug: 194156688

Reason for revert: b/194156688. Original issue fixed by commit I3e4c3faa803afc8c19c33d9340ace098e9d7ed0b.

Change-Id: I21b17f1807e55b668cc17c8e711770daf607c29a
This commit is contained in:
Nathalie Le Clair
2021-08-11 08:00:39 +00:00
parent a9d5ca2f0c
commit 98dc35c200

View File

@@ -1498,11 +1498,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) {
@@ -1545,11 +1540,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);