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

Commit c833d21b authored by Michal Olech's avatar Michal Olech
Browse files

[CEC Configuration] Switch ROUTING_CONTROL setting to SharedPrefs 

Test: manual test
Change-Id: Id94165b4df3cb83a39334cb8d750bbbc899186ca
Bug: 175381065
parent ad2f5e70

core/java/android/provider/Settings.java

+0 −10
Original line number Diff line number Diff line
@@ -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)

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -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,

































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



+2
−2




























Original line number
Diff line number
Diff line








@@ -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: