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

Commit b0818e88 authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

resolve merge conflicts of c2421a2a to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5825e002c7ac5655703cd31d84ccc1cb5379f0e0
parents 596fc8b8 c2421a2a

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

+4 −7
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets; 


import static com.android.server.pm.PackageManagerService.WATCHDOG_TIMEOUT;

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;



/**
@@ -381,13 +384,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
@@ -97,11 +97,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.getDefaultCompilerFilter;

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








@@ -111,11 +111,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);













    }















}