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

Commit 81e3ad3f authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

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

parents 1d609047 9abe3b4a

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