diff options
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 3 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index c9e1944bd6f2..51f69a95e163 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -237,4 +237,7 @@ <!-- Default for Settings.Secure.AWARE_LOCK_ENABLED --> <bool name="def_aware_lock_enabled">false</bool> + + <!-- Default for setting for Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED --> + <bool name="def_hdmiControlAutoDeviceOff">false</bool> </resources> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 94509ddcc407..b95d34f2966b 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -3513,7 +3513,7 @@ public class SettingsProvider extends ContentProvider { } private final class UpgradeController { - private static final int SETTINGS_VERSION = 190; + private static final int SETTINGS_VERSION = 191; private final int mUserId; @@ -4867,6 +4867,21 @@ public class SettingsProvider extends ContentProvider { currentVersion = 190; } + if (currentVersion == 190) { + // Version 190: get HDMI auto device off from overlay + final SettingsState globalSettings = getGlobalSettingsLocked(); + final Setting currentSetting = globalSettings.getSettingLocked( + Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED); + if (currentSetting.isNull()) { + globalSettings.insertSettingLocked( + Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED, + getContext().getResources().getBoolean( + R.bool.def_hdmiControlAutoDeviceOff) ? "1" : "0", + null, true, SettingsState.SYSTEM_PACKAGE_NAME); + } + currentVersion = 191; + } + // vXXX: Add new settings above this point. if (currentVersion != newVersion) { |