Merge "CEC: Defer CEC actions until logical address is available" into nyc-dev am: 4853d65a60

am: 655c815cba

* commit '655c815cbae9181488bf2c7168d1b07186eb2d04':
  CEC: Defer CEC actions until logical address is available

Change-Id: Id42881e14172d0522f8cd465940d15288ef25f7d

services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java

@@ -650,7 +650,7 @@ abstract class HdmiCecLocalDevice {
     void addAndStartAction(final HdmiCecFeatureAction action) {
         assertRunOnServiceThread();
         mActions.add(action);
-        if (mService.isPowerStandby()) {
+        if (mService.isPowerStandby() || !mService.isAddressAllocated()) {
             Slog.i(TAG, "Not ready to start action. Queued for deferred start:" + action);
             return;
         }

services/core/java/com/android/server/hdmi/HdmiControlService.java

@@ -641,6 +641,10 @@ public final class HdmiControlService extends SystemService {
         }
     }
 
+    boolean isAddressAllocated() {
+        return mAddressAllocated;
+    }
+
     // Initialize HDMI port information. Combine the information from CEC and MHL HAL and
     // keep them in one place.
     @ServiceThreadOnly