From 9a6d9858acf2b4674cc12117e5a62c9d30bd2edd Mon Sep 17 00:00:00 2001 From: Nick Chalko Date: Thu, 13 Feb 2020 16:56:35 -0800 Subject: [PATCH] Default wake on plug to false Bug:149479986 Change-Id: Id8c6f083d5d25b4db8cc4d7809b6681a6b234547 Test: m framework --- services/core/java/com/android/server/hdmi/Constants.java | 2 +- .../com/android/server/hdmi/HdmiCecLocalDevicePlayback.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/hdmi/Constants.java b/services/core/java/com/android/server/hdmi/Constants.java index 648e07a01c1cc..ac3a65310d316 100644 --- a/services/core/java/com/android/server/hdmi/Constants.java +++ b/services/core/java/com/android/server/hdmi/Constants.java @@ -395,7 +395,7 @@ final class Constants { static final String PROPERTY_PREFERRED_ADDRESS_TV = "persist.sys.hdmi.addr.tv"; // TODO(OEM): Set this to false to keep the playback device in sleep upon hotplug event. - // True by default. + // False by default. static final String PROPERTY_WAKE_ON_HOTPLUG = "ro.hdmi.wake_on_hotplug"; /** diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java index 09443242d4991..5541b116cf54a 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java @@ -45,7 +45,7 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { private static final String TAG = "HdmiCecLocalDevicePlayback"; private static final boolean WAKE_ON_HOTPLUG = - SystemProperties.getBoolean(Constants.PROPERTY_WAKE_ON_HOTPLUG, true); + SystemProperties.getBoolean(Constants.PROPERTY_WAKE_ON_HOTPLUG, false); private static final boolean SET_MENU_LANGUAGE = HdmiProperties.set_menu_language().orElse(false);