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

Commit 8a5adf2c authored by Michal Olech's avatar Michal Olech
Browse files

[CEC Configuration] Switch TV_WAKE_ON_ONE_TOUCH_PLAY to SharedPrefs 

Test: manual test
Change-Id: Ic3f0eaa07f89ba317581ede56a74e99b5c38cbe1
Bug: 175381065
parent 28b217b7

core/java/android/provider/Settings.java

+0 −10
Original line number Diff line number Diff line
@@ -11049,16 +11049,6 @@ public final class Settings { 
        @Readable

        public static final String HDMI_CONTROL_ENABLED = "hdmi_control_enabled";













        /**













         * Whether TV will automatically turn on upon reception of the CEC command













         * <Text View On> or <Image View On>. (0 = false, 1 = true)













         *













         * @hide













         */













        @Readable













        public static final String HDMI_CONTROL_AUTO_WAKEUP_ENABLED =













                "hdmi_control_auto_wakeup_enabled";



























        /**















         * Whether TV will also turn off other CEC devices when it goes to standby mode.















         * (0 = false, 1 = true)

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -804,9 +804,6 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Global.HDMI_CONTROL_ENABLED,















                GlobalSettingsProto.Hdmi.CONTROL_ENABLED);













        dumpSetting(s, p,













                Settings.Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED,













                GlobalSettingsProto.Hdmi.CONTROL_AUTO_WAKEUP_ENABLED);















        dumpSetting(s, p,















                Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED,















                GlobalSettingsProto.Hdmi.CONTROL_AUTO_DEVICE_OFF_ENABLED);

































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



+0
−1




























Original line number
Diff line number
Diff line








@@ -300,7 +300,6 @@ public class SettingsBackupTest {













                    Settings.Global.GNSS_SATELLITE_BLOCKLIST,















                    Settings.Global.GPRS_REGISTER_CHECK_PERIOD_MS,















                    Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED,













                    Settings.Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED,















                    Settings.Global.HDMI_CONTROL_ENABLED,















                    Settings.Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP,















                    Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED,

































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



+2
−6




























Original line number
Diff line number
Diff line








@@ -534,7 +534,7 @@ public class HdmiCecConfig {













            case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_MODE_MUTING:















                return STORAGE_SHARED_PREFS;















            case HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY:













                return STORAGE_GLOBAL_SETTINGS;













                return STORAGE_SHARED_PREFS;















            case HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP:















                return STORAGE_GLOBAL_SETTINGS;















            case HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_TV:










@@ -575,7 +575,7 @@ public class HdmiCecConfig {













            case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_MODE_MUTING:















                return setting.getName();















            case HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY:













                return Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED;













                return setting.getName();















            case HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP:















                return Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED;















            case HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_TV:










@@ -637,9 +637,6 @@ public class HdmiCecConfig {













            case Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP:















                notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE);















                break;













            case Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED:













                notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY);













                break;















            case Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED:















                notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP);















                break;










@@ -685,7 +682,6 @@ public class HdmiCecConfig {













        String[] settings = new String[] {















                Global.HDMI_CONTROL_ENABLED,















                Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP,













                Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED,















                Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED,















        };















        for (String setting: settings) {