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

Commit a5445ce9 authored by Jinsuk Kim's avatar Jinsuk Kim
Browse files

CEC: Let arc termination start before standby 

Bug: 19930352
Change-Id: Ie344f06a66beafecf64eccadc1881c4d2ec170b3
parent 2ea13d42

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

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,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
@@ -1572,7 +1572,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.
@@ -1588,6 +1587,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 


        disableSystemAudioIfExist();

        disableArcIfExist();



        super.disableDevice(initiatedByCec, callback);

        clearDeviceInfoList();

        checkIfPendingActionsCleared();

    }