commit 1fffffcf395c8c90aa6204cb69c50bd45f27c2cb
author Calin Juravle <calin@google.com> Fri Jan 29 16:38:55 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 29 16:38:55 2016 +0000
tree 37ede42515d74d45cf6822a0937ac22b6d49f048
parent a3b0c04f34232992374b7239d5a5e76cc596dd09
parent d9c31db2e9e4da08ed43c88135fa7e220bc26ebf

Merge "Revert "Fix optimizable package filter""

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 4d66e10..bce7223 100644
--- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java
+++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
@@ -70,7 +70,8 @@
     }
 
     static boolean canOptimizePackage(PackageParser.Package pkg) {
-        return (pkg.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0;
+        return pkg.canHaveOatDir() &&
+                ((pkg.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0);
     }
 
     /**