Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Defer the app data fixup until we are done with app data clearing above." into tm-dev am: 81e3ad3f8f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16982409

Change-Id: Idc3b112499edde5057e52fc23ea5538b75792b72
This commit is contained in:
Alex Buynytskyy
2022-03-02 02:47:18 +00:00
committed by Automerger Merge Worker
parent 3adb6db87f 81e3ad3f8f
commit 35034af700
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -2070,8 +2070,6 @@ public class PackageManagerService extends IPackageManager.Stub
} }
} }
mPrepareAppDataFuture = mAppDataHelper.fixAppsDataOnBoot();
// If this is first boot after an OTA, and a normal boot, then // If this is first boot after an OTA, and a normal boot, then
// we need to clear code cache directories. // we need to clear code cache directories.
// Note that we do *not* clear the application profiles. These remain valid // Note that we do *not* clear the application profiles. These remain valid
@@ -2092,6 +2090,9 @@ public class PackageManagerService extends IPackageManager.Stub
ver.fingerprint = PackagePartitions.FINGERPRINT; ver.fingerprint = PackagePartitions.FINGERPRINT;
} }
// Defer the app data fixup until we are done with app data clearing above.
mPrepareAppDataFuture = mAppDataHelper.fixAppsDataOnBoot();
// Legacy existing (installed before Q) non-system apps to hide // Legacy existing (installed before Q) non-system apps to hide
// their icons in launcher. // their icons in launcher.
if (!mOnlyCore && mIsPreQUpgrade) { if (!mOnlyCore && mIsPreQUpgrade) {