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

Commit 5c9a0085 authored by Calin Juravle's avatar Calin Juravle
Browse files

Update the reference profile from .dm files only during installs 

In order to speed up first boot time we only create the current profile
and do not update the content of the reference profile. A system image
should already be configured with the right profile keys and the
profiles for the speed-profile prebuilds should already be copied (that's
done in #performDexOptUpgrade).

Test: manual (install apps and splits, take OTA)
Bug: 114046578
Change-Id: I99db76684430b929c52634c25b457e874648e205
parent b23ae220

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

+14 −2
Original line number Diff line number Diff line
@@ -15336,7 +15336,9 @@ public class PackageManagerService extends IPackageManager.Stub 
            // This needs to be done before invoking dexopt so that any install-time profile

            // can be used for optimizations.

            mArtManagerService.prepareAppProfiles(

                    pkg, resolveUserIds(reconciledPkg.installForUser.getIdentifier()));

                    pkg,

                    resolveUserIds(reconciledPkg.installForUser.getIdentifier()),

                    /* updateReferenceProfileContent= */ true);















            // Check whether we need to dexopt the app.















            //










@@ -21184,8 +21186,18 @@ public class PackageManagerService extends IPackageManager.Stub













        //















        // We also have to cover non system users because we do not call the usual install package















        // methods for them.













        //













        // NOTE: in order to speed up first boot time we only create the current profile and do not













        // update the content of the reference profile. A system image should already be configured













        // with the right profile keys and the profiles for the speed-profile prebuilds should













        // already be copied. That's done in #performDexOptUpgrade.













        //













        // TODO(calin, mathieuc): We should use .dm files for prebuilds profiles instead of













        // manually copying them in #performDexOptUpgrade. When we do that we should have a more













        // granular check here and only update the existing profiles.















        if (mIsUpgrade || mFirstBoot || (userId != UserHandle.USER_SYSTEM)) {













            mArtManagerService.prepareAppProfiles(pkg, userId);













            mArtManagerService.prepareAppProfiles(pkg, userId,













                /* updateReferenceProfileContent= */ false);















        }





























        if ((flags & StorageManager.FLAG_STORAGE_CE) != 0 && ceDataInode != -1) {

























services/core/java/com/android/server/pm/dex/ArtManagerService.java



+13
−5




























Original line number
Diff line number
Diff line








@@ -389,7 +389,8 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub {













     *   - create the current primary profile to save time at app startup time.















     *   - copy the profiles from the associated dex metadata file to the reference profile.















     */













    public void prepareAppProfiles(PackageParser.Package pkg, @UserIdInt int user) {













    public void prepareAppProfiles(PackageParser.Package pkg, @UserIdInt int user,













            boolean updateReferenceProfileContent) {















        final int appId = UserHandle.getAppId(pkg.applicationInfo.uid);















        if (user < 0) {















            Slog.wtf(TAG, "Invalid user id: " + user);









@@ -404,8 +405,14 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub {













            for (int i = codePathsProfileNames.size() - 1; i >= 0; i--) {















                String codePath = codePathsProfileNames.keyAt(i);















                String profileName = codePathsProfileNames.valueAt(i);













                String dexMetadataPath = null;













                // Passing the dex metadata file to the prepare method will update the reference













                // profile content. As such, we look for the dex metadata file only if we need to













                // perform an update.













                if (updateReferenceProfileContent) {















                    File dexMetadata = DexMetadataHelper.findDexMetadataForFile(new File(codePath));













                String dexMetadataPath = dexMetadata == null ? null : dexMetadata.getAbsolutePath();













                    dexMetadataPath = dexMetadata == null ? null : dexMetadata.getAbsolutePath();













                }















                synchronized (mInstaller) {















                    boolean result = mInstaller.prepareAppProfile(pkg.packageName, user, appId,















                            profileName, codePath, dexMetadataPath);









@@ -423,9 +430,10 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub {













    /**















     * Prepares the app profiles for a set of users. {@see ArtManagerService#prepareAppProfiles}.















     */













    public void prepareAppProfiles(PackageParser.Package pkg, int[] user) {













    public void prepareAppProfiles(PackageParser.Package pkg, int[] user,













            boolean updateReferenceProfileContent) {















        for (int i = 0; i < user.length; i++) {













            prepareAppProfiles(pkg, user[i]);













            prepareAppProfiles(pkg, user[i], updateReferenceProfileContent);















        }















    }