From 98dc35c200b964baa0443eb05a4c72eb703fd242 Mon Sep 17 00:00:00 2001 From: Nathalie Le Clair Date: Wed, 11 Aug 2021 08:00:39 +0000 Subject: [PATCH] Revert "Not handling portSelect and deviceSelect when device is standby" This reverts commit a9d5ca2f0c01f6b992c06996dcc54ba4b1419760. Bug: 194156688 Reason for revert: b/194156688. Original issue fixed by commit I3e4c3faa803afc8c19c33d9340ace098e9d7ed0b. Change-Id: I21b17f1807e55b668cc17c8e711770daf607c29a --- .../com/android/server/hdmi/HdmiControlService.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index df4674c958b02..440676a3ae8f8 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -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);