Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64317576 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents f68358b1 092a8b60

packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java

+1 −2
Original line number Diff line number Diff line
@@ -245,8 +245,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) {

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -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>,

services/core/java/com/android/server/pm/PackageArchiver.java

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ public class PackageArchiver { 
    }



    public static boolean isArchivingEnabled() {

        return Flags.archiving() || SystemProperties.getBoolean("pm.archiving.enabled", false);

        return Flags.archiving();

    }



    @VisibleForTesting