From d9c31db2e9e4da08ed43c88135fa7e220bc26ebf Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Fri, 29 Jan 2016 16:38:11 +0000 Subject: [PATCH] Revert "Fix optimizable package filter" Bug: 26863668 This reverts commit 8aaaf138887355f218b5da3f0efe1c4610a6c31a. Change-Id: I659e2de56afd729f36aa111772fec8c9c2ddf801 --- .../core/java/com/android/server/pm/PackageDexOptimizer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java index 4d66e104e45a5..bce722389a04c 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 @@ 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); } /**