diff options
3 files changed, 3 insertions, 4 deletions
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java b/packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java index 221ca4fd1c66..4763c0b2dd40 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java @@ -244,8 +244,7 @@ public class UninstallAlertDialogFragment extends DialogFragment implements } private static boolean isArchivingEnabled() { - return android.content.pm.Flags.archiving() - || SystemProperties.getBoolean("pm.archiving.enabled", false); + return android.content.pm.Flags.archiving(); } private boolean isCloneProfile(UserHandle userHandle) { diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt index a395266ba5f9..e1e1ee5a8feb 100644 --- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt +++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt @@ -151,7 +151,7 @@ class AppListRepositoryImpl( } private fun isArchivingEnabled(featureFlags: FeatureFlags) = - featureFlags.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false) + featureFlags.archiving() override fun showSystemPredicate( userIdFlow: Flow<Int>, diff --git a/services/core/java/com/android/server/pm/PackageArchiver.java b/services/core/java/com/android/server/pm/PackageArchiver.java index 372e18b0d248..7fc72ae0fea7 100644 --- a/services/core/java/com/android/server/pm/PackageArchiver.java +++ b/services/core/java/com/android/server/pm/PackageArchiver.java @@ -186,7 +186,7 @@ public class PackageArchiver { } public static boolean isArchivingEnabled() { - return Flags.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false); + return Flags.archiving(); } @VisibleForTesting |