Merge "Fix stuck HDMI-CEC actions after boot"

eirv · Sep 28, 2021 · d801fed · d801fed
2 parents 0fe46d9 + 85b7711
commit d801fed
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -556,6 +556,12 @@ private void bootCompleted() {
         // on boot, if device is interactive, set HDMI CEC state as powered on as well
         if (mPowerManager.isInteractive() && isPowerStandbyOrTransient()) {
             mPowerStatus = HdmiControlManager.POWER_STATUS_ON;
+            // Start all actions that were queued because the device was in standby
+            if (mAddressAllocated) {
+                for (HdmiCecLocalDevice localDevice : getAllLocalDevices()) {
+                    localDevice.startQueuedActions();
+                }
+            }
         }
     }