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

Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob"

Browse Source
This commit is contained in:
Treehugger Robot
2017-11-10 10:22:17 +00:00
committed by Gerrit Code Review
parent 3e9b9b74b4 66a285d9d7
commit 41f1ef8c02
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

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

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

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