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

Commit 54334ce7 authored by Nathalie Le Clair's avatar Nathalie Le Clair Committed by Automerger Merge Worker
Browse files

Merge changes Ie0a7ec38,I5199dc85 am: da70abc9 am: 4d657988 am: 4b6ffaba am: 622d24f0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614041

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b5376f867041106a6792fea2d98b2a12cbeb86d
parents c5e235f6 622d24f0

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

+13 −2
Original line number Diff line number Diff line
@@ -665,8 +665,19 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
                        mSelectRequestBuffer.process();

                        resetSelectRequestBuffer();



                        addAndStartAction(new HotplugDetectionAction(HdmiCecLocalDeviceTv.this));

                        addAndStartAction(new PowerStatusMonitorAction(HdmiCecLocalDeviceTv.this));

                        List<HotplugDetectionAction> hotplugActions

                                = getActions(HotplugDetectionAction.class);

                        if (hotplugActions.isEmpty()) {

                            addAndStartAction(

                                    new HotplugDetectionAction(HdmiCecLocalDeviceTv.this));

                        }



                        List<PowerStatusMonitorAction> powerStatusActions

                                = getActions(PowerStatusMonitorAction.class);

                        if (powerStatusActions.isEmpty()) {

                            addAndStartAction(

                                    new PowerStatusMonitorAction(HdmiCecLocalDeviceTv.this));

                        }



                        HdmiDeviceInfo avr = getAvrDeviceInfo();

                        if (avr != null) {

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

+2 −2
Original line number Diff line number Diff line
@@ -106,9 +106,7 @@ public final class HdmiCecStandbyModeHandler { 
        addHandler(Constants.MESSAGE_SET_STREAM_PATH, mBystander);

        addHandler(Constants.MESSAGE_STANDBY, mBystander);

        addHandler(Constants.MESSAGE_SET_MENU_LANGUAGE, mBystander);

        addHandler(Constants.MESSAGE_DEVICE_VENDOR_ID, mBystander);

        addHandler(Constants.MESSAGE_USER_CONTROL_RELEASED, mBystander);

        addHandler(Constants.MESSAGE_REPORT_POWER_STATUS, mBystander);

        addHandler(Constants.MESSAGE_FEATURE_ABORT, mBystander);

        addHandler(Constants.MESSAGE_INACTIVE_SOURCE, mBystander);

        addHandler(Constants.MESSAGE_SYSTEM_AUDIO_MODE_STATUS, mBystander);
@@ -133,6 +131,8 @@ public final class HdmiCecStandbyModeHandler { 
        addHandler(Constants.MESSAGE_GIVE_DEVICE_VENDOR_ID, mBypasser);

        addHandler(Constants.MESSAGE_GIVE_OSD_NAME, mBypasser);

        addHandler(Constants.MESSAGE_SET_OSD_NAME, mBypasser);

        addHandler(Constants.MESSAGE_DEVICE_VENDOR_ID, mBypasser);

        addHandler(Constants.MESSAGE_REPORT_POWER_STATUS, mBypasser);



        addHandler(Constants.MESSAGE_USER_CONTROL_PRESSED, mUserControlProcessedHandler);