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

Commit a34610ce authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Gerrit Code Review
Browse files

Merge "Handle safe mode in PackageManager."

parents 66f685a2 d093b203

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

+3 −8
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ import static com.android.server.pm.Installer.DEXOPT_STORAGE_DE; 
import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;

import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;



import static com.android.server.pm.PackageManagerServiceCompilerMapping.getNonProfileGuidedCompilerFilter;

import static dalvik.system.DexFile.getNonProfileGuidedCompilerFilter;

import static dalvik.system.DexFile.getSafeModeCompilerFilter;

import static dalvik.system.DexFile.isProfileGuidedCompilerFilter;



/**
@@ -359,13 +360,7 @@ public class PackageDexOptimizer { 
        int flags = info.flags;

        boolean vmSafeMode = (flags & ApplicationInfo.FLAG_VM_SAFE_MODE) != 0;

        if (vmSafeMode) {

            // For the compilation, it doesn't really matter what we return here because installd

            // will replace the filter with 'quicken' anyway.

            // However, we return a non profile guided filter so that we simplify the logic of

            // merging profiles.

            // TODO(calin): safe mode path could be simplified if we pass 'quicken' from

            //              here rather than letting installd decide on the filter.

            return getNonProfileGuidedCompilerFilter(targetCompilerFilter);

            return getSafeModeCompilerFilter(targetCompilerFilter);

        }



        if (isProfileGuidedCompilerFilter(targetCompilerFilter) && isUsedByOtherApps) {

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

+2 −1
Original line number Diff line number Diff line
@@ -92,11 +92,12 @@ import static com.android.server.pm.InstructionSets.getPreferredInstructionSet; 
import static com.android.server.pm.InstructionSets.getPrimaryInstructionSet;

import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason;

import static com.android.server.pm.PackageManagerServiceCompilerMapping.getFullCompilerFilter;

import static com.android.server.pm.PackageManagerServiceCompilerMapping.getNonProfileGuidedCompilerFilter;

import static com.android.server.pm.PermissionsState.PERMISSION_OPERATION_FAILURE;

import static com.android.server.pm.PermissionsState.PERMISSION_OPERATION_SUCCESS;

import static com.android.server.pm.PermissionsState.PERMISSION_OPERATION_SUCCESS_GIDS_CHANGED;













import static dalvik.system.DexFile.getNonProfileGuidedCompilerFilter;



























import android.Manifest;















import android.annotation.NonNull;















import android.annotation.Nullable;

































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



+0
−7




























Original line number
Diff line number
Diff line








@@ -123,11 +123,4 @@ public class PackageManagerServiceCompilerMapping {





























        return value;















    }



























    /**













     * Return the non-profile-guided filter corresponding to the given filter.













     */













    public static String getNonProfileGuidedCompilerFilter(String filter) {













        return DexFile.getNonProfileGuidedCompilerFilter(filter);













    }















}