From afd26a250777521f692cbc2553349210f69a1bc1 Mon Sep 17 00:00:00 2001
From: Donghyun Cho <donghyun@google.com>
Date: Fri, 23 Dec 2016 15:53:28 +0900
Subject: [PATCH] CEC: Revive a standby handler

When a device is going into standby state, every CEC message is supposed
to be handled by HdmiCecStandbyModeHandler. But the messages were
blocked by address allocation check and just buffered. This change
revives the standby handler so that the device can handle messages
properly during standby mode.

Bug: 30184027, Bug: 31873357, Bug: 33095971
Test: One touch play with chromecast works well during standby mode
Change-Id: I3315fdaee346838c6a2c68bad0ac64b94ab9723c
---
 .../java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java   | 3 ++-
 .../java/com/android/server/hdmi/HdmiControlService.java     | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index 4526ab74387bc..7c5550a678e20 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -250,7 +250,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
     @ServiceThreadOnly
     boolean dispatchMessage(HdmiCecMessage message) {
         assertRunOnServiceThread();
-        if (mService.isPowerStandby() && mStandbyHandler.handleCommand(message)) {
+        if (mService.isPowerStandby() && !mService.isWakeUpMessageReceived()
+                && mStandbyHandler.handleCommand(message)) {
             return true;
         }
         return super.onMessage(message);
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 18f1b6c0513c7..3cebf6332dadb 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -2014,6 +2014,10 @@ public final class HdmiControlService extends SystemService {
         // the intent, the sequence will continue at onStandby().
     }
 
+    boolean isWakeUpMessageReceived() {
+        return mWakeUpMessageReceived;
+    }
+
     @ServiceThreadOnly
     private void onWakeUp() {
         assertRunOnServiceThread();
@@ -2116,7 +2120,6 @@ public final class HdmiControlService extends SystemService {
             device.onStandby(mStandbyMessageReceived, standbyAction);
         }
         mStandbyMessageReceived = false;
-        mAddressAllocated = false;
         mCecController.setOption(OptionKey.SYSTEM_CEC_CONTROL, false);
         mMhlController.setOption(OPTION_MHL_SERVICE_CONTROL, DISABLED);
     }