Merge "Revert "Fix optimizable package filter""

2016-01-29 16:38:55 +00:00
parent a3b0c04f34 d9c31db2e9
commit 1fffffcf39
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java
+++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
@@ -70,7 +70,8 @@ final class PackageDexOptimizer {
    }

    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);
    }

    /**