Merge "Fix useProfiles usage in PackageDexOptimizer"

2016-02-05 11:55:43 +00:00
parent 181a43103b 0cf8cc66ec
commit 1fc4a27762
1 changed files with 8 additions and 2 deletions
--- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java
+++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
@@ -176,8 +176,14 @@ class PackageDexOptimizer {
                dexoptNeeded = adjustDexoptNeeded(dexoptNeeded);

                if (dexoptNeeded == DexFile.NO_DEXOPT_NEEDED) {
-                    // No dexopt needed and we don't use profiles. Nothing to do.
-                    continue;
+                    if (useProfiles) {
+                        // Profiles may trigger re-compilation. The final decision is taken in
+                        // installd.
+                        dexoptNeeded = DexFile.DEX2OAT_NEEDED;
+                    } else {
+                        // No dexopt needed and we don't use profiles. Nothing to do.
+                        continue;
+                    }
                }
                final String dexoptType;
                String oatDir = null;