Merge "Defer the app data fixup until we are done with app data clearing above." into tm-dev
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 4a871cf..3893cfd 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -2070,8 +2070,6 @@
}
}
- mPrepareAppDataFuture = mAppDataHelper.fixAppsDataOnBoot();
-
// If this is first boot after an OTA, and a normal boot, then
// we need to clear code cache directories.
// Note that we do *not* clear the application profiles. These remain valid
@@ -2092,6 +2090,9 @@
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
// their icons in launcher.
if (!mOnlyCore && mIsPreQUpgrade) {