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

Commit 69c67e74 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove ro.hdmi.wake_on_hotplug" into rvc-dev am: c8d30126 

Change-Id: I685ec37a3cf686ccb2b2784a4094336dc551a7c3
parents 39fbb5d7 c8d30126

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

+0 −6
Original line number Diff line number Diff line
@@ -44,9 +44,6 @@ import java.util.Locale; 
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, false);



    private static final boolean SET_MENU_LANGUAGE =

            HdmiProperties.set_menu_language().orElse(false);
@@ -152,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();

        }