summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/DevelopmentSettings.java
diff options
context:
space:
mode:
authorScott Mertz <scott@cyngn.com>2016-02-16 09:11:23 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-02-16 12:02:17 -0800
commit55abf844c0c1e4dc93b87d0977ed1ff294a9266d (patch)
treee8e1a8b6c5cf75958b579af63fe9b581233d2a11 /src/com/android/settings/DevelopmentSettings.java
parent69f45f56e41f7f7fe70c497216d1ea0b8cecc62f (diff)
downloadpackages_apps_Settings-55abf844c0c1e4dc93b87d0977ed1ff294a9266d.zip
packages_apps_Settings-55abf844c0c1e4dc93b87d0977ed1ff294a9266d.tar.gz
packages_apps_Settings-55abf844c0c1e4dc93b87d0977ed1ff294a9266d.tar.bz2
DevelopmentSettings: initialize recovery update property at boot
Android behavior has changed to load & trigger build.prop & default.prop at every boot. Once data is mounted, it reloads & triggers properties set by the user. If we set persist.sys.recovery_update to true in build.prop or default.prop, the user's preference will never be honored. Instead, ensure the default always comes from userdata. Accompanying patches to remove the default properties are required. OPO-490 Change-Id: I3a5245088059f083554063ba6d345783114fa7a0
Diffstat (limited to 'src/com/android/settings/DevelopmentSettings.java')
-rw-r--r--src/com/android/settings/DevelopmentSettings.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 2f753ef..d8b1d17 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1773,13 +1773,19 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
pokeSystemProperties();
}
- private void resetUpdateRecoveryOptions() {
+ private static void resetUpdateRecoveryOptions() {
// User builds should update recovery by default
if ("user".equals(Build.TYPE)) {
SystemProperties.set(UPDATE_RECOVERY_PROPERTY, "true");
}
}
+ public static void initializeUpdateRecoveryOption() {
+ if (TextUtils.isEmpty(SystemProperties.get(UPDATE_RECOVERY_PROPERTY))) {
+ resetUpdateRecoveryOptions();
+ }
+ }
+
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
if (switchView != mSwitchBar.getSwitch()) {