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

Commit d6d27e3a authored by Calin Juravle's avatar Calin Juravle
Browse files

Delete app profiles only during updates and uninstalls 

Apps code doesn't change across OTAs so keeping profiles alive will help
have a base for OTA time optimizations (e.g. verify based on profiles to
speed up app startup).

Split claring and destroying the profiles in two different methods,
consistent to how application data is cleared/destroyed.

Bug: 27081617
Bug: 27688727
Change-Id: Ie375499075be990f4f046c8cc2029d80321d5eb5
parent 58ae2782

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

+6 −2
Original line number Diff line number Diff line
@@ -166,8 +166,12 @@ public final class Installer extends SystemService { 
        mInstaller.execute("rmpackagedir", packageDir);

    }



    public void rmProfiles(String pkgName) throws InstallerException {

        mInstaller.execute("rmprofiles", pkgName);

    public void clearAppProfiles(String pkgName) throws InstallerException {

        mInstaller.execute("clear_app_profiles", pkgName);

    }



    public void destroyAppProfiles(String pkgName) throws InstallerException {

        mInstaller.execute("destroy_app_profiles", pkgName);

    }



    public void createUserConfig(int userid) throws InstallerException {

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

+28 −1
Original line number Diff line number Diff line
@@ -7172,6 +7172,30 @@ public class PackageManagerService extends IPackageManager.Stub { 
        }

    }













    private void deleteProfilesLI(String packageName, boolean destroy) {













        final PackageParser.Package pkg;













        synchronized (mPackages) {













            pkg = mPackages.get(packageName);













        }













        if (pkg == null) {













            Slog.w(TAG, "Failed to delete profiles. No package: " + packageName);













            return;













        }













        deleteProfilesLI(pkg, destroy);













    }

























    private void deleteProfilesLI(PackageParser.Package pkg, boolean destroy) {













        try {













            if (destroy) {













                mInstaller.clearAppProfiles(pkg.packageName);













            } else {













                mInstaller.destroyAppProfiles(pkg.packageName);













            }













        } catch (InstallerException ex) {













            Log.e(TAG, "Could not delete profiles for package " + pkg.packageName);













        }













    }



























    private void deleteCodeCacheDirsLI(String volumeUuid, String packageName) {















        final PackageParser.Package pkg;















        synchronized (mPackages) {










@@ -13204,6 +13228,7 @@ public class PackageManagerService extends IPackageManager.Stub {













            }





























            deleteCodeCacheDirsLI(pkg);













            deleteProfilesLI(pkg, /*destroy*/ false);





























            try {















                final PackageParser.Package newPackage = scanPackageTracedLI(pkg, parseFlags,










@@ -13338,6 +13363,7 @@ public class PackageManagerService extends IPackageManager.Stub {



























        // Successfully disabled the old package. Now proceed with re-installation















        deleteCodeCacheDirsLI(pkg);













        deleteProfilesLI(pkg, /*destroy*/ false);





























        res.setReturnCode(PackageManager.INSTALL_SUCCEEDED);















        pkg.setApplicationInfoFlags(ApplicationInfo.FLAG_UPDATED_SYSTEM_APP,










@@ -14410,6 +14436,7 @@ public class PackageManagerService extends IPackageManager.Stub {













            if (DEBUG_REMOVE) Slog.d(TAG, "deletePackageX: pkg=" + packageName + " user=" + userId);















            res = deletePackageLI(packageName, removeForUser, true, allUsers,















                    flags | REMOVE_CHATTY, info, true, null);













            deleteProfilesLI(packageName, /*destroy*/ true);















            synchronized (mPackages) {















                if (res) {















                    mEphemeralApplicationRegistry.onPackageUninstalledLPw(uninstalledPs.pkg);










@@ -15177,7 +15204,7 @@ public class PackageManagerService extends IPackageManager.Stub {













    public void clearApplicationProfileData(String packageName) {















        enforceSystemOrRoot("Only the system can clear all profile data");















        try {













            mInstaller.rmProfiles(packageName);













            mInstaller.clearAppProfiles(packageName);















        } catch (InstallerException ex) {















            Log.e(TAG, "Could not clear profile data of package " + packageName);















        }