From b3219ef7f83619c2ba8e2fdba06304cc08d81d30 Mon Sep 17 00:00:00 2001
From: Nathalie Le Clair <lcnathalie@google.com>
Date: Fri, 9 Apr 2021 09:33:16 +0000
Subject: [PATCH] Revert "Exit dream mode on CEC wake message received"

This reverts commit 19e81e4d8876ae7af6dc5de928aa353a266f4799.

Reason for revert: b/184842617

Change-Id: Ifd86b175df18ec3de2b06cd25a6e0bea7c374a3a
---
 .../server/hdmi/HdmiCecLocalDevicePlayback.java      | 12 ++++++++++++
 .../server/hdmi/HdmiCecLocalDeviceSource.java        |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
index a647437e10187..299525207a601 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -257,6 +257,18 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
         return super.handleUserControlPressed(message);
     }
 
+    @Override
+    protected void wakeUpIfActiveSource() {
+        if (!isActiveSource()) {
+            return;
+        }
+        // Wake up the device if the power is in standby mode, or its screen is off -
+        // which can happen if the device is holding a partial lock.
+        if (mService.isPowerStandbyOrTransient() || !mService.getPowerManager().isScreenOn()) {
+            mService.wakeUp();
+        }
+    }
+
     @ServiceThreadOnly
     protected boolean handleSetMenuLanguage(HdmiCecMessage message) {
         assertRunOnServiceThread();
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
index f496e195b7a7f..2ed84811250e9 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
@@ -369,7 +369,7 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice {
         if (!isActiveSource()) {
             return;
         }
-        // Wake up the device. This will also exit dream mode.
+        // Wake up the device
         mService.wakeUp();
         return;
     }