Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 659c486b authored by Jinsuk Kim's avatar Jinsuk Kim
Browse files

CEC: Make wakeup on hotplug optional 

Added a new system property to make the feature optional. True
by default.

Bug: 20897914
Change-Id: I8bfca5144b802b95361e63b29abd6371971c7dbb
parent edcaf7c9

services/core/java/com/android/server/hdmi/Constants.java

+4 −0
Original line number Diff line number Diff line
@@ -214,6 +214,10 @@ final class Constants { 
    //     values which denotes the device type in HDMI Spec 1.4.

    static final String PROPERTY_DEVICE_TYPE = "ro.hdmi.device_type";



    // TODO(OEM): Set this to false to keep the playback device in sleep upon hotplug event.

    //            True by default.

    static final String PROPERTY_WAKE_ON_HOTPLUG = "ro.hdmi.wake_on_hotplug";



    // Set to false to allow playback device to go to suspend mode even

    // when it's an active source. True by default.

    static final String PROPERTY_KEEP_AWAKE = "persist.sys.hdmi.keep_awake";

services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java

+4 −1
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly; 
final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {

    private static final String TAG = "HdmiCecLocalDevicePlayback";



    private static final boolean WAKE_ON_HOTPLUG =

            SystemProperties.getBoolean(Constants.PROPERTY_WAKE_ON_HOTPLUG, true);



    private boolean mIsActiveSource = false;



    // Used to keep the device awake while it is the active source. For devices that
@@ -130,7 +133,7 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice { 
        assertRunOnServiceThread();

        mCecMessageCache.flushAll();

        // We'll not clear mIsActiveSource on the hotplug event to pass CETC 11.2.2-2 ~ 3.

        if (connected && mService.isPowerStandbyOrTransient()) {

        if (WAKE_ON_HOTPLUG && connected && mService.isPowerStandbyOrTransient()) {

            mService.wakeUp();

        }

        if (!connected) {