Merge "Remove ro.hdmi.wake_on_hotplug" am: 6960fbc340

Change-Id: Ibf51ed847d7a269e4a0b5d88f65bd4a534497ecd
This commit is contained in:
TreeHugger Robot
2020-05-12 12:42:33 +00:00
committed by Automerger Merge Worker

View File

@@ -44,8 +44,6 @@ import java.util.Locale;
public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
private static final String TAG = "HdmiCecLocalDevicePlayback";
private static final boolean WAKE_ON_HOTPLUG = false;
private static final boolean SET_MENU_LANGUAGE =
HdmiProperties.set_menu_language_enabled().orElse(false);
@@ -151,9 +149,6 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
assertRunOnServiceThread();
mCecMessageCache.flushAll();
// We'll not clear mIsActiveSource on the hotplug event to pass CETC 11.2.2-2 ~ 3.
if (WAKE_ON_HOTPLUG && connected && mService.isPowerStandbyOrTransient()) {
mService.wakeUp();
}
if (!connected) {
getWakeLock().release();
}