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

Commit ca8fc5aa authored by Rohit Goyal's avatar Rohit Goyal Committed by Android (Google) Code Review
Browse files

Merge "Fix uninstallation flow for archived apps on UI side." into main

parents 4cf478ee 0d77047b

packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ public class UninstallerActivity extends Activity { 


        try {

            mDialogInfo.appInfo = pm.getApplicationInfo(mPackageName,

                    PackageManager.ApplicationInfoFlags.of(PackageManager.MATCH_ANY_USER));

                    PackageManager.ApplicationInfoFlags.of(PackageManager.MATCH_ANY_USER

                            | PackageManager.MATCH_ARCHIVED_PACKAGES));

        } catch (PackageManager.NameNotFoundException e) {

            Log.e(TAG, "Unable to get packageName. Package manager is dead?");

        }

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

+2 −1
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ public class UninstallAlertDialogFragment extends DialogFragment implements 


        boolean suggestToKeepAppData;

        try {

            PackageInfo pkgInfo = pm.getPackageInfo(pkg, 0);

            PackageInfo pkgInfo = pm.getPackageInfo(pkg,

                    PackageManager.PackageInfoFlags.of(PackageManager.MATCH_ARCHIVED_PACKAGES));



            suggestToKeepAppData = pkgInfo.applicationInfo.hasFragileUserData();

        } catch (PackageManager.NameNotFoundException e) {

services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -411,6 +411,9 @@ public class PackageInfoUtils { 
            ai.overlayPaths = overlayPaths.getOverlayPaths().toArray(new String[0]);

        }

        ai.isArchived = PackageArchiver.isArchived(state);

        if (ai.isArchived) {

            ai.nonLocalizedLabel = state.getArchiveState().getActivityInfos().get(0).getTitle();

        }

    }



    @Nullable