From 66a285d9d7afe197a5a562525641400db80edcef Mon Sep 17 00:00:00 2001 From: Victor Hsieh Date: Thu, 9 Nov 2017 10:32:10 -0800 Subject: [PATCH] DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob Other than the renaming, the meaning is now opposite. Test: build Bug: 67415855 Bug: 63920015 Change-Id: I349c0b233079b5958e4a308d6c7ad9b3a54f157a --- .../java/com/android/server/am/ActivityManagerService.java | 2 +- .../core/java/com/android/server/pm/PackageDexOptimizer.java | 4 ++-- .../java/com/android/server/pm/PackageManagerService.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index d9944a7546b7f..90b8e29b122d5 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -3857,7 +3857,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; } diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java index ef015e7e418b2..401eb62f0b1bf 100644 --- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java +++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java @@ -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.isPrivilegedApp()) { - return SystemProperties.getBoolean("pm.dexopt.priv-apps", true); + return !SystemProperties.getBoolean("pm.dexopt.priv-apps-oob", false); } return true; diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 242a76dbb63f8..8853aa0e89756 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -10270,7 +10270,7 @@ public class PackageManagerService extends IPackageManager.Stub if (Build.IS_DEBUGGABLE && pkg.isPrivilegedApp() && - !SystemProperties.getBoolean("pm.dexopt.priv-apps", true)) { + SystemProperties.getBoolean("pm.dexopt.priv-apps-oob", false)) { PackageManagerServiceUtils.logPackageHasUncompressedCode(pkg); }