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

Merge "Rewrite handling of oob priv-apps in framework."

Browse Source
This commit is contained in:
Nicolas Geoffray
2018-01-25 08:59:28 +00:00
committed by Android (Google) Code Review
parent c510a619bc 11d21a2976
commit d2204db2c6
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -4063,7 +4063,6 @@ public class ActivityManagerService extends IActivityManager.Stub
if (app.info.isPrivilegedApp() &&
SystemProperties.getBoolean("pm.dexopt.priv-apps-oob", false)) {
runtimeFlags |= Zygote.DISABLE_VERIFIER;
runtimeFlags |= Zygote.ONLY_USE_SYSTEM_OAT_FILES;
}

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

@@ -111,11 +111,6 @@ public class PackageDexOptimizer {
return false;
}
// We do not dexopt a priv-app package when pm.dexopt.priv-apps-oob is true.
if (pkg.isPrivileged()) {
return !SystemProperties.getBoolean("pm.dexopt.priv-apps-oob", false);
}
return true;
}
@@ -481,6 +476,11 @@ public class PackageDexOptimizer {
boolean isUsedByOtherApps) {
int flags = info.flags;
boolean vmSafeMode = (flags & ApplicationInfo.FLAG_VM_SAFE_MODE) != 0;
// When pm.dexopt.priv-apps-oob is true, we only verify privileged apps.
if (info.isPrivilegedApp() &&
SystemProperties.getBoolean("pm.dexopt.priv-apps-oob", false)) {
return "verify";
}
if (vmSafeMode) {
return getSafeModeCompilerFilter(targetCompilerFilter);
}