From 9689a6b8bbea18db4e5b7a31a455c93a6f35ceaf Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Fri, 13 Nov 2020 00:44:34 +0100 Subject: [PATCH] Updater: Retrieve recovery update setting using the prop itself This makes it easier to share the setting with SetupWizard. Change-Id: I9a69df99c1b9a198ef9d5a039a090721b0195064 --- src/org/lineageos/updater/UpdatesActivity.java | 5 ++--- src/org/lineageos/updater/misc/Constants.java | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java index df9a8fd8..6e93153b 100644 --- a/src/org/lineageos/updater/UpdatesActivity.java +++ b/src/org/lineageos/updater/UpdatesActivity.java @@ -434,7 +434,8 @@ public class UpdatesActivity extends UpdatesListActivity { // Might be the case of A-only devices using prebuilt vendor images. updateRecovery.setVisibility(View.GONE); } else if (Utils.isRecoveryUpdateExecPresent()) { - updateRecovery.setChecked(prefs.getBoolean(Constants.PREF_UPDATE_RECOVERY, false)); + updateRecovery.setChecked( + SystemProperties.getBoolean(Constants.UPDATE_RECOVERY_PROPERTY, false)); } else { // There is no recovery updater script in the device, so the feature is considered // forcefully enabled, just to avoid users to be confused and complain that @@ -469,8 +470,6 @@ public class UpdatesActivity extends UpdatesListActivity { dataWarning.isChecked()) .putBoolean(Constants.PREF_AB_PERF_MODE, abPerfMode.isChecked()) - .putBoolean(Constants.PREF_UPDATE_RECOVERY, - updateRecovery.isChecked()) .apply(); if (Utils.isUpdateCheckEnabled(this)) { diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java index 5e1cc8b0..0597eab6 100644 --- a/src/org/lineageos/updater/misc/Constants.java +++ b/src/org/lineageos/updater/misc/Constants.java @@ -34,7 +34,6 @@ public final class Constants { public static final String PREF_AB_PERF_MODE = "ab_perf_mode"; public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning"; public static final String PREF_NEEDS_REBOOT_ID = "needs_reboot_id"; - public static final String PREF_UPDATE_RECOVERY = "update_recovery"; public static final String UNCRYPT_FILE_EXT = ".uncrypt";