Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ie0a7ec38,I5199dc85 am: da70abc9e1 am: 4d657988ef

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14e901f0656ba0981c4a3b57f801ad59d3420dd0
This commit is contained in:
Nathalie Le Clair
2021-03-04 13:45:33 +00:00
committed by Automerger Merge Worker
parent 2f5ce95057 4d657988ef
commit 4b6ffaba2d
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
View File

@@ -768,8 +768,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) {

4
services/core/java/com/android/server/hdmi/HdmiCecStandbyModeHandler.java
View File

@@ -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);