PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings/Archive] remove all checks for the archiving system property" into main

Browse Source
This commit is contained in:
Song Chun Fan
2024-04-08 22:36:39 +00:00
committed by Android (Google) Code Review
parent fba70edef5 6ae958abd2
commit 523fd97cb4
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/AppCounter.java
View File

@@ -72,8 +72,7 @@ public abstract class AppCounter extends AsyncTask<Void, Void, Integer> {
} }
private boolean isArchivingEnabled() { private boolean isArchivingEnabled() {
return mFf.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false) return mFf.archiving() || Flags.appArchiving();
|| Flags.appArchiving();
} }
@Override @Override

3
src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
View File

@@ -179,5 +179,4 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
} }
fun isArchivingEnabled(featureFlags: PmFeatureFlags) = fun isArchivingEnabled(featureFlags: PmFeatureFlags) =
featureFlags.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false) featureFlags.archiving() || Flags.appArchiving()
|| Flags.appArchiving()

3
src/com/android/settings/spa/app/appinfo/HibernationSwitchPreference.kt
View File

@@ -93,8 +93,7 @@ fun HibernationSwitchPreference(
} }
private fun isArchivingEnabled() = private fun isArchivingEnabled() =
PmFlags.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false) PmFlags.archiving() || Flags.appArchiving()
|| Flags.appArchiving()
private class HibernationSwitchPresenter(context: Context, private val app: ApplicationInfo) { private class HibernationSwitchPresenter(context: Context, private val app: ApplicationInfo) {
private val appOpsManager = context.appOpsManager private val appOpsManager = context.appOpsManager

3
tests/spa_unit/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreferenceTest.kt
View File

@@ -163,8 +163,7 @@ class HibernationSwitchPreferenceTest {
} }
private fun isArchivingEnabled() = private fun isArchivingEnabled() =
PmFlags.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false) PmFlags.archiving() || Flags.appArchiving()
|| Flags.appArchiving()
@Test @Test
fun `An app targets Q with ops mode default when hibernation targets pre S - not exempted`() { fun `An app targets Q with ops mode default when hibernation targets pre S - not exempted`() {
mockOpsMode(MODE_DEFAULT) mockOpsMode(MODE_DEFAULT)