From 844d2f4c67c0b258c70cf59a7c9eabe3b512024f Mon Sep 17 00:00:00 2001 From: Song Chun Fan Date: Mon, 8 Apr 2024 18:16:11 +0000 Subject: [PATCH] [Settings/Archive] remove all checks for the archiving system property No longer needed BUG: 331165939 Test: builds (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6ae958abd26ed77ecd4d3fb1720bb912553da2ea) Merged-In: I24bc9a3d7503da1606d29eb3dfa963b0e6bf9d3e Change-Id: I24bc9a3d7503da1606d29eb3dfa963b0e6bf9d3e --- src/com/android/settings/applications/AppCounter.java | 3 +-- src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt | 3 +-- .../settings/spa/app/appinfo/HibernationSwitchPreference.kt | 3 +-- .../spa/app/appinfo/HibernationSwitchPreferenceTest.kt | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/applications/AppCounter.java b/src/com/android/settings/applications/AppCounter.java index 2b1e47eaf23..bc752e94fd7 100644 --- a/src/com/android/settings/applications/AppCounter.java +++ b/src/com/android/settings/applications/AppCounter.java @@ -72,8 +72,7 @@ public abstract class AppCounter extends AsyncTask { } private boolean isArchivingEnabled() { - return mFf.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false) - || Flags.appArchiving(); + return mFf.archiving() || Flags.appArchiving(); } @Override diff --git a/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt index c12915c6a0d..3b2fdcfa7da 100644 --- a/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt +++ b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt @@ -183,5 +183,4 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) { } fun isArchivingEnabled(featureFlags: PmFeatureFlags) = - featureFlags.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false) - || Flags.appArchiving() \ No newline at end of file + featureFlags.archiving() || Flags.appArchiving() \ No newline at end of file diff --git a/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreference.kt b/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreference.kt index 86d7f445090..7a45ed4ea2f 100644 --- a/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreference.kt +++ b/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreference.kt @@ -93,8 +93,7 @@ fun HibernationSwitchPreference( } private fun isArchivingEnabled() = - PmFlags.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false) - || Flags.appArchiving() + PmFlags.archiving() || Flags.appArchiving() private class HibernationSwitchPresenter(context: Context, private val app: ApplicationInfo) { private val appOpsManager = context.appOpsManager diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreferenceTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreferenceTest.kt index b61e3a9fd7c..a0be3f2498a 100644 --- a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreferenceTest.kt +++ b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreferenceTest.kt @@ -163,8 +163,7 @@ class HibernationSwitchPreferenceTest { } private fun isArchivingEnabled() = - PmFlags.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false) - || Flags.appArchiving() + PmFlags.archiving() || Flags.appArchiving() @Test fun `An app targets Q with ops mode default when hibernation targets pre S - not exempted`() { mockOpsMode(MODE_DEFAULT)