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

Commit d35dfb65 authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Android (Google) Code Review
Browse files

Merge "CEC: Let arc termination start before standby"

parents 1139559f a5445ce9

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

+1 −1
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ abstract class HdmiCecLocalDevice { 
    void addAndStartAction(final HdmiCecFeatureAction action) {

        assertRunOnServiceThread();

        mActions.add(action);

        if (mService.isPowerStandbyOrTransient()) {

        if (mService.isPowerStandby()) {

            Slog.i(TAG, "Not ready to start action. Queued for deferred start:" + action);

            return;

        }

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

+2 −1
Original line number Diff line number Diff line
@@ -1581,7 +1581,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    @Override

    @ServiceThreadOnly

    protected void disableDevice(boolean initiatedByCec, PendingActionClearedCallback callback) {

        super.disableDevice(initiatedByCec, callback);

        assertRunOnServiceThread();

        mService.unregisterTvInputCallback(mTvInputCallback);

        // Remove any repeated working actions.
@@ -1597,6 +1596,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 


        disableSystemAudioIfExist();

        disableArcIfExist();



        super.disableDevice(initiatedByCec, callback);

        clearDeviceInfoList();

        checkIfPendingActionsCleared();

    }