From 2520584da346efe06c0c45b31025addfefc891cc Mon Sep 17 00:00:00 2001 From: "daren.liao" Date: Fri, 5 Feb 2021 13:51:50 +0800 Subject: [PATCH] Fix CEC init twice in normal boot [Description] Root cause: commit 04848a3e17b52ebfd3ca99bed49a295fe801fa50 Initialize HDMI PowerStatus to standby Solution: Set power status to On instead of calling initializeCec() when bootComplete Test: 2 scenarios with TV Android R - Boot without connecting any device - Connect AVR and DVD Normal boot: CEC is init once, behavior is normal Bug: 174982925 Change-Id: I50a1423ef223156f98c6f21e9be82130a284295a Merged-In: I50a1423ef223156f98c6f21e9be82130a284295a --- .../core/java/com/android/server/hdmi/HdmiControlService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 5d1c4e6715f19..16d4f94277cb1 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -555,7 +555,7 @@ public class HdmiControlService extends SystemService { private void bootCompleted() { // on boot, if device is interactive, set HDMI CEC state as powered on as well if (mPowerManager.isInteractive() && isPowerStandbyOrTransient()) { - onWakeUp(); + mPowerStatus = HdmiControlManager.POWER_STATUS_ON; } }