Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a logic error in getDexoptNeeded." into tm-dev am: e8a0838648

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

Change-Id: I0e3639db82cb27dc58a4322c25bb85a808a80663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jiakai Zhang
2022-06-23 14:47:28 +00:00
committed by Automerger Merge Worker
parent 493ad917f8 e8a0838648
commit 66439a2adb
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/pm/PackageDexOptimizer.java
View File

@@ -936,12 +936,15 @@ public class PackageDexOptimizer {
String classLoaderContext, int profileAnalysisResult, boolean downgrade, String classLoaderContext, int profileAnalysisResult, boolean downgrade,
int dexoptFlags, String oatDir) { int dexoptFlags, String oatDir) {
final boolean shouldBePublic = (dexoptFlags & DEXOPT_PUBLIC) != 0; final boolean shouldBePublic = (dexoptFlags & DEXOPT_PUBLIC) != 0;
// If the artifacts should be public while the current artifacts are not, we should final boolean isProfileGuidedFilter = (dexoptFlags & DEXOPT_PROFILE_GUIDED) != 0;
// re-compile anyway. boolean newProfile = profileAnalysisResult == PROFILE_ANALYSIS_OPTIMIZE;
if (shouldBePublic && isOdexPrivate(packageName, path, isa, oatDir)) {
// Ensure compilation by pretending a compiler filter change on the apk/odex location if (!newProfile && isProfileGuidedFilter && shouldBePublic
// (the reason for the '-'. A positive value means the 'oat' location). && isOdexPrivate(packageName, path, isa, oatDir)) {
return adjustDexoptNeeded(-DexFile.DEX2OAT_FOR_FILTER); // The profile that will be used is a cloud profile, while the profile used previously
// is a user profile. Typically, this happens after an app starts being used by other
// apps.
newProfile = true;
} }
int dexoptNeeded; int dexoptNeeded;
@@ -959,7 +962,6 @@ public class PackageDexOptimizer {
&& profileAnalysisResult == PROFILE_ANALYSIS_DONT_OPTIMIZE_EMPTY_PROFILES) { && profileAnalysisResult == PROFILE_ANALYSIS_DONT_OPTIMIZE_EMPTY_PROFILES) {
actualCompilerFilter = "verify"; actualCompilerFilter = "verify";
} }
boolean newProfile = profileAnalysisResult == PROFILE_ANALYSIS_OPTIMIZE;
dexoptNeeded = DexFile.getDexOptNeeded(path, isa, actualCompilerFilter, dexoptNeeded = DexFile.getDexOptNeeded(path, isa, actualCompilerFilter,
classLoaderContext, newProfile, downgrade); classLoaderContext, newProfile, downgrade);
} catch (IOException ioe) { } catch (IOException ioe) {