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

Commit d6936287 authored by Calin Juravle's avatar Calin Juravle Committed by Android (Google) Code Review
Browse files

Merge "Do not clean up ART profiles during OTAs"

parents 68d068d4 86b6bbd4

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

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ public class Installer extends SystemService { 
    public static final int FLAG_USE_QUOTA = IInstalld.FLAG_USE_QUOTA;

    public static final int FLAG_FORCE = IInstalld.FLAG_FORCE;



    public static final int FLAG_CLEAR_APP_DATA_KEEP_ART_PROFILES =

            IInstalld.FLAG_CLEAR_APP_DATA_KEEP_ART_PROFILES;



    private final boolean mIsolated;



    private volatile IInstalld mInstalld;

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

+7 −3
Original line number Diff line number Diff line
@@ -3251,7 +3251,8 @@ public class PackageManagerService extends IPackageManager.Stub 
                        // No apps are running this early, so no need to freeze

                        clearAppDataLIF(ps.pkg, UserHandle.USER_ALL,

                                FLAG_STORAGE_DE | FLAG_STORAGE_CE | FLAG_STORAGE_EXTERNAL

                                        | Installer.FLAG_CLEAR_CODE_CACHE_ONLY);

                                        | Installer.FLAG_CLEAR_CODE_CACHE_ONLY

                                        | Installer.FLAG_CLEAR_APP_DATA_KEEP_ART_PROFILES);

                    }

                }

                ver.fingerprint = Build.FINGERPRINT;
@@ -10332,8 +10333,10 @@ public class PackageManagerService extends IPackageManager.Stub 
            clearAppDataLeafLIF(pkg.childPackages.get(i), userId, flags);

        }













        if ((flags & Installer.FLAG_CLEAR_APP_DATA_KEEP_ART_PROFILES) == 0) {















            clearAppProfilesLIF(pkg, UserHandle.USER_ALL);















        }













    }





























    private void clearAppDataLeafLIF(PackageParser.Package pkg, int userId, int flags) {















        final PackageSetting ps;










@@ -22553,7 +22556,8 @@ public class PackageManagerService extends IPackageManager.Stub



























                if (!Build.FINGERPRINT.equals(ver.fingerprint)) {















                    clearAppDataLIF(ps.pkg, UserHandle.USER_ALL, FLAG_STORAGE_DE | FLAG_STORAGE_CE













                            | FLAG_STORAGE_EXTERNAL | Installer.FLAG_CLEAR_CODE_CACHE_ONLY);













                            | FLAG_STORAGE_EXTERNAL | Installer.FLAG_CLEAR_CODE_CACHE_ONLY













                            | Installer.FLAG_CLEAR_APP_DATA_KEEP_ART_PROFILES);















                }















            }















        }