From b94b70b90007bdf5f69734bcab6b22116bde16bf Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 17 Sep 2024 21:16:03 +0530 Subject: [PATCH 1/2] Revert "Updater: Force performance mode for FP4 and FP5" This reverts commit 49eae3fb2b3f13bc1b578809ffeb3c7ab75dbae5. --- .../main/java/org/lineageos/updater/UpdatesActivity.java | 5 ----- .../org/lineageos/updater/controller/ABUpdateInstaller.java | 2 +- app/src/main/java/org/lineageos/updater/misc/Utils.java | 6 ------ 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java index f3e8456a..5d845f23 100644 --- a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java +++ b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java @@ -619,11 +619,6 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport abPerfMode.setChecked(prefs.getBoolean(Constants.PREF_AB_PERF_MODE, getResources().getBoolean(R.bool.config_prioritizeUpdateProcess))); - if (Utils.isPrefDevices()) { - abPerfMode.setChecked(true); - abPerfMode.setEnabled(false); - } - if (getResources().getBoolean(R.bool.config_hideRecoveryUpdate)) { // Hide the update feature if explicitly requested. // Might be the case of A-only devices using prebuilt vendor images. diff --git a/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java b/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java index afa9d225..488ec0e0 100644 --- a/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java +++ b/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java @@ -199,7 +199,7 @@ class ABUpdateInstaller { boolean enableABPerfMode = PreferenceManager.getDefaultSharedPreferences(mContext) .getBoolean(Constants.PREF_AB_PERF_MODE, false); - mUpdateEngine.setPerformanceMode(enableABPerfMode || Utils.isPrefDevices()); + mUpdateEngine.setPerformanceMode(enableABPerfMode); String zipFileUri = "file://" + file.getAbsolutePath(); try { diff --git a/app/src/main/java/org/lineageos/updater/misc/Utils.java b/app/src/main/java/org/lineageos/updater/misc/Utils.java index d5dfbb6c..67be7347 100644 --- a/app/src/main/java/org/lineageos/updater/misc/Utils.java +++ b/app/src/main/java/org/lineageos/updater/misc/Utils.java @@ -531,12 +531,6 @@ public class Utils { return isAB; } - public static boolean isPrefDevices() { - String manufacturer = Build.MANUFACTURER.toLowerCase(Locale.ROOT); - String device = Build.DEVICE.toLowerCase(Locale.ROOT); - return manufacturer.equals("fairphone") && (device.equals("fp4") || device.equals("fp5")); - } - public static boolean isDevModeOn(Context context) { return Settings.Secure.getInt(context.getContentResolver(), Settings.Global.DEVELOPMENT_SETTINGS_ENABLED , 0) == 1; -- GitLab From 2ecc0cfc68241fadc070a10323375f50960db28d Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 17 Sep 2024 21:21:51 +0530 Subject: [PATCH 2/2] Updater: Change preference to reset default value --- .../main/java/org/lineageos/updater/UpdatesActivity.java | 2 +- .../lineageos/updater/controller/ABUpdateInstaller.java | 2 +- .../main/java/org/lineageos/updater/misc/Constants.java | 3 ++- app/src/main/java/org/lineageos/updater/misc/Utils.java | 7 +++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java index 5d845f23..64b6c47e 100644 --- a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java +++ b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java @@ -617,7 +617,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport meteredNetworkWarning.setChecked(prefs.getBoolean(Constants.PREF_METERED_NETWORK_WARNING, prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, true))); abPerfMode.setChecked(prefs.getBoolean(Constants.PREF_AB_PERF_MODE, - getResources().getBoolean(R.bool.config_prioritizeUpdateProcess))); + Utils.defaultABPerfMode(this))); if (getResources().getBoolean(R.bool.config_hideRecoveryUpdate)) { // Hide the update feature if explicitly requested. diff --git a/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java b/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java index 488ec0e0..ef969bfd 100644 --- a/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java +++ b/app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java @@ -198,7 +198,7 @@ class ABUpdateInstaller { } boolean enableABPerfMode = PreferenceManager.getDefaultSharedPreferences(mContext) - .getBoolean(Constants.PREF_AB_PERF_MODE, false); + .getBoolean(Constants.PREF_AB_PERF_MODE, Utils.defaultABPerfMode(mContext)); mUpdateEngine.setPerformanceMode(enableABPerfMode); String zipFileUri = "file://" + file.getAbsolutePath(); diff --git a/app/src/main/java/org/lineageos/updater/misc/Constants.java b/app/src/main/java/org/lineageos/updater/misc/Constants.java index 0dfd8ad5..ed02f18a 100644 --- a/app/src/main/java/org/lineageos/updater/misc/Constants.java +++ b/app/src/main/java/org/lineageos/updater/misc/Constants.java @@ -24,7 +24,8 @@ public final class Constants { public static final String PREF_AUTO_UPDATES_CHECK_INTERVAL = "auto_updates_check_interval"; public static final String PREF_AUTO_DELETE_UPDATES = "auto_delete_updates"; public static final String PREF_ALL_UPDATES = "all_updates"; - public static final String PREF_AB_PERF_MODE = "ab_perf_mode"; + public static final String PREF_AB_PERF_MODE_OLD = "ab_perf_mode"; + public static final String PREF_AB_PERF_MODE = "e_ab_perf_mode"; public static final String PREF_METERED_NETWORK_WARNING = "pref_metered_network_warning"; public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning"; public static final String PREF_NEEDS_REBOOT_ID = "needs_reboot_id"; diff --git a/app/src/main/java/org/lineageos/updater/misc/Utils.java b/app/src/main/java/org/lineageos/updater/misc/Utils.java index 67be7347..e3bb192b 100644 --- a/app/src/main/java/org/lineageos/updater/misc/Utils.java +++ b/app/src/main/java/org/lineageos/updater/misc/Utils.java @@ -531,6 +531,13 @@ public class Utils { return isAB; } + public static boolean defaultABPerfMode(Context context) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + boolean oldPrefValue = prefs.getBoolean(Constants.PREF_AB_PERF_MODE_OLD, false); + return (context.getResources().getBoolean(R.bool.config_prioritizeUpdateProcess) + || oldPrefValue); + } + public static boolean isDevModeOn(Context context) { return Settings.Secure.getInt(context.getContentResolver(), Settings.Global.DEVELOPMENT_SETTINGS_ENABLED , 0) == 1; -- GitLab