Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a07dd740 authored by Donghyun Cho's avatar Donghyun Cho Committed by android-build-merger
Browse files

Merge "CEC: Defer CEC actions until logical address is available" into nyc-dev... 

Merge "CEC: Defer CEC actions until logical address is available" into nyc-dev am: 4853d65a am: 655c815c
am: 43f8cd1b

* commit '43f8cd1b':
  CEC: Defer CEC actions until logical address is available

Change-Id: I0af645bbd2e3336d8d759372bbd5dc59ad31a66a
parents bb7f2c86 43f8cd1b

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+4 −0
Original line number Diff line number Diff line
@@ -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