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

Merge "Change pm.dexopt.priv-apps to .priv-apps-oob"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-10 21:31:53 +00:00
committed by Android (Google) Code Review
parent 36f77bc3ff cf0583e229
commit e465e608e4
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -110,9 +110,9 @@ public class PackageDexOptimizer {
return false;
}
// We do not dexopt a priv-app package when pm.dexopt.priv-apps is 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", true);
return !SystemProperties.getBoolean("pm.dexopt.priv-apps-oob", false);
}
return true;

2
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -9598,7 +9598,7 @@ public class PackageManagerService extends IPackageManager.Stub
if (Build.IS_DEBUGGABLE &&
pkg.isPrivileged() &&
!SystemProperties.getBoolean("pm.dexopt.priv-apps", true)) {
SystemProperties.getBoolean("pm.dexopt.priv-apps-oob", false)) {
PackageManagerServiceUtils.logPackageHasUncompressedCode(pkg);
}