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

[CEC Configuration] Switch ROUTING_CONTROL setting to SharedPrefs

Browse Source 
Test: manual test
Change-Id: Id94165b4df3cb83a39334cb8d750bbbc899186ca
Bug: 175381065
This commit is contained in:
Michal Olech
2021-10-05 13:07:08 +02:00
parent ad2f5e70eb
commit c833d21bb2
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/Settings.java
View File

@@ -11098,16 +11098,6 @@ public final class Settings {
public static final String HDMI_SYSTEM_AUDIO_CONTROL_ENABLED =
"hdmi_system_audio_control_enabled";
/**
* Whether HDMI Routing Control feature is enabled. If enabled, the switch device will
* route to the correct input source on receiving Routing Control related messages. If
* disabled, you can only switch the input via controls on this device.
* @hide
*/
@Readable
public static final String HDMI_CEC_SWITCH_ENABLED =
"hdmi_cec_switch_enabled";
/**
* Whether TV will automatically turn on upon reception of the CEC command
* <Text View On> or <Image View On>. (0 = false, 1 = true)

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -299,7 +299,6 @@ public class SettingsBackupTest {
Settings.Global.GNSS_HAL_LOCATION_REQUEST_DURATION_MILLIS,
Settings.Global.GNSS_SATELLITE_BLOCKLIST,
Settings.Global.GPRS_REGISTER_CHECK_PERIOD_MS,
Settings.Global.HDMI_CEC_SWITCH_ENABLED,
Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED,
Settings.Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED,
Settings.Global.HDMI_CONTROL_ENABLED,

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

@@ -522,7 +522,7 @@ public class HdmiCecConfig {
case HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION:
return STORAGE_SHARED_PREFS;
case HdmiControlManager.CEC_SETTING_NAME_ROUTING_CONTROL:
return STORAGE_GLOBAL_SETTINGS;
return STORAGE_SHARED_PREFS;
case HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE:
return STORAGE_GLOBAL_SETTINGS;
case HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE:
@@ -563,7 +563,7 @@ public class HdmiCecConfig {
case HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION:
return setting.getName();
case HdmiControlManager.CEC_SETTING_NAME_ROUTING_CONTROL:
return Global.HDMI_CEC_SWITCH_ENABLED;
return setting.getName();
case HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE:
return Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP;
case HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE: