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

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

Merge "Invoke One Touch Play on wakeUp for HDMI playback devices" into rvc-dev... 

Merge "Invoke One Touch Play on wakeUp for HDMI playback devices" into rvc-dev am: a018ca00 am: 9a22be23 am: 9c887a4f

Change-Id: I220d26e7f9cf7c2ca8ada878b2ae80c4b2d3bba0
parents 5a887ce4 9c887a4f

services/core/java/com/android/server/policy/PhoneWindowManager.java

+6 −6
Original line number Diff line number Diff line
@@ -4468,12 +4468,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    private void wakeUpFromPowerKey(long eventTime) {

        wakeUp(eventTime, mAllowTheaterModeWakeFromPowerKey,

                PowerManager.WAKE_REASON_POWER_BUTTON, "android.policy:POWER");



        // Turn on the connected TV and switch HDMI input if we're a HDMI playback device.

        final HdmiControl hdmiControl = getHdmiControl();

        if (hdmiControl != null) {

            hdmiControl.turnOnTv();

        }

    }



    private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode, @WakeReason int reason,
@@ -4489,6 +4483,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }



        mPowerManager.wakeUp(wakeTime, reason, details);



        // Turn on the connected TV and switch HDMI input if we're a HDMI playback device.

        final HdmiControl hdmiControl = getHdmiControl();

        if (hdmiControl != null) {

            hdmiControl.turnOnTv();

        }

        return true;

    }