commit f12af2f67d5a34f231f44fb444fe54283ff53203
author Victor Hsieh <victorhsieh@google.com> Thu Jan 03 10:11:03 2019 -0800
committer Victor Hsieh <victorhsieh@google.com> Mon Jan 07 10:44:20 2019 -0800
tree b1d5282cca5157991167d66d9325740e78639dba
parent f15c48160431e4b55a0d08cfe8d5e06b74cac1c2

Skip dexopt if app has preferCodeIntegrity=true

Test: 1. adb install com.android.cts.appintegrity.apk
      2. adb shell cmd package compile -m speed -f com.android.cts.appintegrity
      3. adb shell oatdump --oat-file=$(echo /data/app/com.android.cts.appintegrity-*/oat/arm64/base.odex)
      => no code is observed in oatdump, only if preferCodeIntegrity=true
Bug: 112037137
Change-Id: Ic7defd8096ae9ccb231c3d4b5ffa3adfa4b8dfab

services/core/java/com/android/server/pm/PackageDexOptimizer.java

diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
index f9e31ae..db7e99d 100644
--- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java
+++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
@@ -509,8 +509,10 @@
             boolean isUsedByOtherApps) {
         int flags = info.flags;
         boolean vmSafeMode = (flags & ApplicationInfo.FLAG_VM_SAFE_MODE) != 0;
-        // When a priv app is configured to run out of box, only verify it.
-        if (info.isPrivilegedApp() && DexManager.isPackageSelectedToRunOob(info.packageName)) {
+        // When an app or priv app is configured to run out of box, only verify it.
+        if (info.isCodeIntegrityPreferred()
+                || (info.isPrivilegedApp()
+                    && DexManager.isPackageSelectedToRunOob(info.packageName))) {
             return "verify";
         }
         if (vmSafeMode) {