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

Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev am: eeff674786

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

Change-Id: I462c649a8f35b6afa7ddc66bc72c356766b8dfb8
This commit is contained in:
Nathalie Le Clair
2020-06-15 13:36:57 +00:00
committed by Automerger Merge Worker
parent 258bbc2f4d eeff674786
commit 51b76ac0de
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -237,4 +237,7 @@
<!-- Default for Settings.Secure.AWARE_LOCK_ENABLED --> <!-- Default for Settings.Secure.AWARE_LOCK_ENABLED -->
<bool name="def_aware_lock_enabled">false</bool> <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> </resources>

17
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -3513,7 +3513,7 @@ public class SettingsProvider extends ContentProvider {
} }
private final class UpgradeController { private final class UpgradeController {
private static final int SETTINGS_VERSION = 190; private static final int SETTINGS_VERSION = 191;
private final int mUserId; private final int mUserId;
@@ -4867,6 +4867,21 @@ public class SettingsProvider extends ContentProvider {
currentVersion = 190; 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. // vXXX: Add new settings above this point.
if (currentVersion != newVersion) { if (currentVersion != newVersion) {