Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I8805357fb0d5df8fabec55872b2c957212ac4fd8
This commit is contained in:
TreeHugger Robot
2020-04-14 12:43:31 +00:00
committed by Automerger Merge Worker
parent 221b38481d a018ca00cf
commit 19cfbd2b38
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -4468,12 +4468,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
private void wakeUpFromPowerKey(long eventTime) { private void wakeUpFromPowerKey(long eventTime) {
wakeUp(eventTime, mAllowTheaterModeWakeFromPowerKey, wakeUp(eventTime, mAllowTheaterModeWakeFromPowerKey,
PowerManager.WAKE_REASON_POWER_BUTTON, "android.policy:POWER"); 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, private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode, @WakeReason int reason,
@@ -4489,6 +4483,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
mPowerManager.wakeUp(wakeTime, reason, details); 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; return true;
} }