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

Commit 3288f8af authored by Amy's avatar Amy Committed by shubang
Browse files

When device reboots, it should not go to real standby. 

ag/5340093

This means the device should not do onStandby in HdmiControlService so
that it does not disable device or send out Inactive Source or turn off
system audio mode, etc.

Test: local tested.
Bug: 117106186, 116125794
Change-Id: I454a6d2266a35a223dd5d32338799d39e1e83ef7
parent 476e546b

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

+4 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static com.android.server.hdmi.Constants.OPTION_MHL_ENABLE; 
import static com.android.server.hdmi.Constants.OPTION_MHL_INPUT_SWITCHING;

import static com.android.server.hdmi.Constants.OPTION_MHL_POWER_CHARGE;

import static com.android.server.hdmi.Constants.OPTION_MHL_SERVICE_CONTROL;

import static com.android.server.power.ShutdownThread.SHUTDOWN_ACTION_PROPERTY;



import android.annotation.Nullable;

import android.content.BroadcastReceiver;
@@ -184,9 +185,10 @@ public class HdmiControlService extends SystemService { 
        @Override

        public void onReceive(Context context, Intent intent) {

            assertRunOnServiceThread();

            boolean isReboot = SystemProperties.get(SHUTDOWN_ACTION_PROPERTY).contains("1");

            switch (intent.getAction()) {

                case Intent.ACTION_SCREEN_OFF:

                    if (isPowerOnOrTransient()) {

                    if (isPowerOnOrTransient() && !isReboot) {

                        onStandby(STANDBY_SCREEN_OFF);

                    }

                    break;
@@ -202,7 +204,7 @@ public class HdmiControlService extends SystemService { 
                    }

                    break;

                case Intent.ACTION_SHUTDOWN:

                    if (isPowerOnOrTransient()) {

                    if (isPowerOnOrTransient() && !isReboot) {

                        onStandby(STANDBY_SHUTDOWN);

                    }

                    break;