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

Commit acef49a4 authored by Michal Olech's avatar Michal Olech Committed by Automerger Merge Worker
Browse files

Merge changes from topic "HdmiCecVersionSharedPrefs" into sc-dev am: 873c5414 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13582327

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I335bb233ab47a23cddb9eea15da8c38dedc2a2db
parents e1f22b7d 873c5414

core/java/android/provider/Settings.java

+0 −8
Original line number Diff line number Diff line
@@ -10705,14 +10705,6 @@ public final class Settings { 
        public static final String HDMI_CEC_SWITCH_ENABLED =

                "hdmi_cec_switch_enabled";













        /**













         * HDMI CEC version to use. Defaults to v1.4b.













         * @hide













         */













        @Readable













        public static final String HDMI_CEC_VERSION =













                "hdmi_cec_version";



























        /**















         * 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_SATELLITE_BLOCKLIST,















                    Settings.Global.GPRS_REGISTER_CHECK_PERIOD_MS,















                    Settings.Global.HDMI_CEC_SWITCH_ENABLED,













                    Settings.Global.HDMI_CEC_VERSION,















                    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
−6




























Original line number
Diff line number
Diff line








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













            case HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_ENABLED:















                return STORAGE_GLOBAL_SETTINGS;















            case HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION:













                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:










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













            case HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_ENABLED:















                return Global.HDMI_CONTROL_ENABLED;















            case HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION:













                return Global.HDMI_CEC_VERSION;













                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:










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













            case Global.HDMI_CONTROL_ENABLED:















                notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_ENABLED);















                break;













            case Global.HDMI_CEC_VERSION:













                notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION);













                break;















            case Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP:















                notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE);















                break;










@@ -461,7 +458,6 @@ public class HdmiCecConfig {













        ContentResolver resolver = mContext.getContentResolver();















        String[] settings = new String[] {















                Global.HDMI_CONTROL_ENABLED,













                Global.HDMI_CEC_VERSION,















                Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP,















                Global.HDMI_CONTROL_VOLUME_CONTROL_ENABLED,















                Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED,

































services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java



+0
−11




























Original line number
Diff line number
Diff line








@@ -484,17 +484,6 @@ public class HdmiControlServiceTest {













                HdmiControlManager.VOLUME_CONTROL_ENABLED);















    }





























    @Test













    public void getCecVersion_default() {













        // Set the Settings value to "null" to emulate it being empty and force the default value.













        Settings.Global.putString(mContextSpy.getContentResolver(),













                Settings.Global.HDMI_CEC_VERSION,













                null);













        mHdmiControlService.setControlEnabled(HdmiControlManager.HDMI_CEC_CONTROL_ENABLED);













        assertThat(mHdmiControlService.getCecVersion()).isEqualTo(













                HdmiControlManager.HDMI_CEC_VERSION_1_4_B);













    }





























    @Test















    public void getCecVersion_1_4() {















        mHdmiControlService.getHdmiCecConfig().setIntValue(