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

Commit 7a055622 authored by Songchun Fan's avatar Songchun Fan
Browse files

[pm] do not delete data dir for uninstalls with -k 

Packages deleted with DELETE_KEEP_DATA is now marked as not-installed.
This CL prevents their data dir from being deleted during reboots.

BUG: 300051780
Test: manual; will add hostside tests

Change-Id: I19cd7feb9854f86f893659757a612f410597100c
parent 7ecfda68

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

+5 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.server.pm.dex.ArtManagerService; 
import com.android.server.pm.parsing.pkg.AndroidPackageUtils;

import com.android.server.pm.pkg.AndroidPackage;

import com.android.server.pm.pkg.PackageStateInternal;

import com.android.server.pm.pkg.PackageUserStateInternal;

import com.android.server.pm.pkg.SELinuxUtil;



import dalvik.system.VMRuntime;
@@ -502,6 +503,7 @@ public class AppDataHelper { 
    private void assertPackageStorageValid(@NonNull Computer snapshot, String volumeUuid,

            String packageName, int userId) throws PackageManagerException {

        final PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName);

        final PackageUserStateInternal userState = packageState.getUserStateOrDefault(userId);

        if (packageState == null) {

            throw PackageManagerException.ofInternalError("Package " + packageName + " is unknown",

                    PackageManagerException.INTERNAL_ERROR_STORAGE_INVALID_PACKAGE_UNKNOWN);
@@ -510,9 +512,10 @@ public class AppDataHelper { 
                    "Package " + packageName + " found on unknown volume " + volumeUuid

                            + "; expected volume " + packageState.getVolumeUuid(),

                    PackageManagerException.INTERNAL_ERROR_STORAGE_INVALID_VOLUME_UNKNOWN);

        } else if (!packageState.getUserStateOrDefault(userId).isInstalled()) {

        } else if (!userState.isInstalled() && !userState.dataExists()) {

            throw PackageManagerException.ofInternalError(

                    "Package " + packageName + " not installed for user " + userId,

                    "Package " + packageName + " not installed for user " + userId

                            + " or was deleted without DELETE_KEEP_DATA",

                    PackageManagerException.INTERNAL_ERROR_STORAGE_INVALID_NOT_INSTALLED_FOR_USER);

        } else if (packageState.getPkg() != null

                && !shouldHaveAppStorage(packageState.getPkg())) {