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

Merge "CEC: Check standby action availability before request for sleep mode" into nyc-mr1-dev

Browse Source
This commit is contained in:
Donghyun Cho
2016-10-16 03:09:20 +00:00
committed by Android (Google) Code Review
parent 742b0a7d12 02920a08e1
commit c00a6cb9c3
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -2011,6 +2011,9 @@ public final class HdmiControlService extends SystemService {
@ServiceThreadOnly @ServiceThreadOnly
void standby() { void standby() {
assertRunOnServiceThread(); assertRunOnServiceThread();
if (!canGoToStandby()) {
return;
}
mStandbyMessageReceived = true; mStandbyMessageReceived = true;
mPowerManager.goToSleep(SystemClock.uptimeMillis(), PowerManager.GO_TO_SLEEP_REASON_HDMI, 0); mPowerManager.goToSleep(SystemClock.uptimeMillis(), PowerManager.GO_TO_SLEEP_REASON_HDMI, 0);
// PowerManger will send the broadcast Intent.ACTION_SCREEN_OFF and after this gets // PowerManger will send the broadcast Intent.ACTION_SCREEN_OFF and after this gets
@@ -2038,10 +2041,13 @@ public final class HdmiControlService extends SystemService {
@ServiceThreadOnly @ServiceThreadOnly
private void onStandby(final int standbyAction) { private void onStandby(final int standbyAction) {
assertRunOnServiceThread(); assertRunOnServiceThread();
if (!canGoToStandby()) return;
mPowerStatus = HdmiControlManager.POWER_STATUS_TRANSIENT_TO_STANDBY; mPowerStatus = HdmiControlManager.POWER_STATUS_TRANSIENT_TO_STANDBY;
invokeVendorCommandListenersOnControlStateChanged(false, invokeVendorCommandListenersOnControlStateChanged(false,
HdmiControlManager.CONTROL_STATE_CHANGED_REASON_STANDBY); HdmiControlManager.CONTROL_STATE_CHANGED_REASON_STANDBY);
if (!canGoToStandby()) {
mPowerStatus = HdmiControlManager.POWER_STATUS_STANDBY;
return;
}
final List<HdmiCecLocalDevice> devices = getAllLocalDevices(); final List<HdmiCecLocalDevice> devices = getAllLocalDevices();
disableDevices(new PendingActionClearedCallback() { disableDevices(new PendingActionClearedCallback() {