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

Merge changes Ie0a7ec38,I5199dc85

Browse Source 
* changes:
  Handle messages in standby for DeviceDiscoveryAction
  Prevent periodic actions from starting twice
This commit is contained in:
Nathalie Le Clair
2021-03-04 11:01:12 +00:00
committed by Gerrit Code Review
parent 78a488cd10 a2dbb68546
commit da70abc9e1
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(); mSelectRequestBuffer.process();
resetSelectRequestBuffer(); resetSelectRequestBuffer();
addAndStartAction(new HotplugDetectionAction(HdmiCecLocalDeviceTv.this)); List<HotplugDetectionAction> hotplugActions
addAndStartAction(new PowerStatusMonitorAction(HdmiCecLocalDeviceTv.this)); = 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(); HdmiDeviceInfo avr = getAvrDeviceInfo();
if (avr != null) { 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_SET_STREAM_PATH, mBystander);
addHandler(Constants.MESSAGE_STANDBY, mBystander); addHandler(Constants.MESSAGE_STANDBY, mBystander);
addHandler(Constants.MESSAGE_SET_MENU_LANGUAGE, 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_USER_CONTROL_RELEASED, mBystander);
addHandler(Constants.MESSAGE_REPORT_POWER_STATUS, mBystander);
addHandler(Constants.MESSAGE_FEATURE_ABORT, mBystander); addHandler(Constants.MESSAGE_FEATURE_ABORT, mBystander);
addHandler(Constants.MESSAGE_INACTIVE_SOURCE, mBystander); addHandler(Constants.MESSAGE_INACTIVE_SOURCE, mBystander);
addHandler(Constants.MESSAGE_SYSTEM_AUDIO_MODE_STATUS, 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_DEVICE_VENDOR_ID, mBypasser);
addHandler(Constants.MESSAGE_GIVE_OSD_NAME, mBypasser); addHandler(Constants.MESSAGE_GIVE_OSD_NAME, mBypasser);
addHandler(Constants.MESSAGE_SET_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); addHandler(Constants.MESSAGE_USER_CONTROL_PRESSED, mUserControlProcessedHandler);