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

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

Merge "Don\'t broadcast <Standby> message during shutdown when setting is disabled" into nyc-dev 

am: cff08461

* commit 'cff08461':
  Don't broadcast <Standby> message during shutdown when setting is disabled

Change-Id: If14b5d3c941d352f71a66e2fa0c193c1c61f3d1c
parents 12d00a7e cff08461

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -165,15 +165,13 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice { 
    @ServiceThreadOnly

    @ServiceThreadOnly

    protected void onStandby(boolean initiatedByCec, int standbyAction) {

    protected void onStandby(boolean initiatedByCec, int standbyAction) {

        assertRunOnServiceThread();

        assertRunOnServiceThread();

        if (!mService.isControlEnabled() || initiatedByCec) {

        if (!mService.isControlEnabled() || initiatedByCec || !mAutoTvOff) {

            return;

            return;

        }

        }

        switch (standbyAction) {

        switch (standbyAction) {

            case HdmiControlService.STANDBY_SCREEN_OFF:

            case HdmiControlService.STANDBY_SCREEN_OFF:

                if (mAutoTvOff) {

                mService.sendCecCommand(

                mService.sendCecCommand(

                        HdmiCecMessageBuilder.buildStandby(mAddress, Constants.ADDR_TV));

                        HdmiCecMessageBuilder.buildStandby(mAddress, Constants.ADDR_TV));

                }

                break;

                break;

            case HdmiControlService.STANDBY_SHUTDOWN:

            case HdmiControlService.STANDBY_SHUTDOWN:

                // ACTION_SHUTDOWN is taken as a signal to power off all the devices.

                // ACTION_SHUTDOWN is taken as a signal to power off all the devices.