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

Commit 1e153a18 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Defer the app data fixup until we are done with app data clearing... 

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

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

Change-Id: Iacf42807eb263dda9f21e83c838c3d046769ab2d
parents 0956f4f9 81e3ad3f

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

+3 −2
Original line number Diff line number Diff line
@@ -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

            // we need to clear code cache directories.

            // 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;

            }



            // 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) {