From 6dfd83dbe88bd461f5aab224ced0830b07db1c03 Mon Sep 17 00:00:00 2001
From: Calin Juravle <calin@google.com>
Date: Fri, 29 Jan 2016 18:23:57 +0000
Subject: Revert "Revert "Fix optimizable package filter""

The issue was traced to go/aog/854901. This revert was only temporary.

Bug: 26863668
This reverts commit d9c31db2e9e4da08ed43c88135fa7e220bc26ebf.

Change-Id: I6724059db18263936cc392651c621d27836f1c33
---
 services/core/java/com/android/server/pm/PackageDexOptimizer.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
index bce722389a04..4d66e104e45a 100644
--- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java
+++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
@@ -70,8 +70,7 @@ final class PackageDexOptimizer {
     }
 
     static boolean canOptimizePackage(PackageParser.Package pkg) {
-        return pkg.canHaveOatDir() &&
-                ((pkg.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0);
+        return (pkg.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0;
     }
 
     /**
-- 
cgit v1.2.3-59-g8ed1b