From 2227b5ae102309ce85501b16e82cb51094dadcd8 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Mon, 17 Jun 2019 17:13:55 -0700 Subject: [PATCH] Do not clean up ART profiles during OTAs Test: manual, upgrade & test for profiles Bug: 135299330 (cherry picked from commit 86b6bbd4c593aedb3c5e27995727fb2cb55c604b) Merged-In: I39d3376fc845ec5f2b474ea6f39a3c534ed2ce69 Change-Id: I29833113f7d0806733be669cfbc6fe2b206a982f --- .../core/java/com/android/server/pm/Installer.java | 3 +++ .../com/android/server/pm/PackageManagerService.java | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java index adcd19e9bb5aa..b3b0029326d54 100644 --- a/services/core/java/com/android/server/pm/Installer.java +++ b/services/core/java/com/android/server/pm/Installer.java @@ -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; diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index cec5c6d75014d..9791ff3e02ba9 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -3136,7 +3136,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; @@ -10222,7 +10223,9 @@ public class PackageManagerService extends IPackageManager.Stub clearAppDataLeafLIF(pkg.childPackages.get(i), userId, flags); } - clearAppProfilesLIF(pkg, UserHandle.USER_ALL); + 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) { @@ -22047,7 +22050,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); } } }