commit 06815d6023f03f0169d67634b3ba10d60c33c7e2
author Shubham Ajmera <shubhamajmera@google.com> Mon Jul 10 21:57:44 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 10 21:57:44 2017 +0000
tree 2fddb9c4fc823b1c08f153d072634935a11f91aa
parent 1a7d868804af59cfc6456bb156358505a572443d
parent 71e6a7fda9f35d223a5a39343e35d4ffe4517d83

Merge "Keep track of primary dexopt"

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index e3575a9..700d3c2 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -9346,33 +9346,29 @@
                     false /* force */,
                     bootComplete);
 
-            boolean secondaryDexOptStatus = true;
             if (pkg.isSystemApp()) {
                 // Only dexopt shared secondary dex files belonging to system apps to not slow down
                 // too much boot after an OTA.
-                secondaryDexOptStatus = mDexManager.dexoptSecondaryDex(pkg.packageName,
+                mDexManager.dexoptSecondaryDex(pkg.packageName,
                         compilerFilter,
                         false /* force */,
                         true /* compileOnlySharedDex */);
             }
 
-            if (secondaryDexOptStatus) {
-                switch (primaryDexOptStaus) {
-                    case PackageDexOptimizer.DEX_OPT_PERFORMED:
-                        numberOfPackagesOptimized++;
-                        break;
-                    case PackageDexOptimizer.DEX_OPT_SKIPPED:
-                        numberOfPackagesSkipped++;
-                        break;
-                    case PackageDexOptimizer.DEX_OPT_FAILED:
-                        numberOfPackagesFailed++;
-                        break;
-                    default:
-                        Log.e(TAG, "Unexpected dexopt return code " + primaryDexOptStaus);
-                        break;
-                }
-            } else {
-                numberOfPackagesFailed++;
+            // TODO(shubhamajmera): Record secondary dexopt stats.
+            switch (primaryDexOptStaus) {
+                case PackageDexOptimizer.DEX_OPT_PERFORMED:
+                    numberOfPackagesOptimized++;
+                    break;
+                case PackageDexOptimizer.DEX_OPT_SKIPPED:
+                    numberOfPackagesSkipped++;
+                    break;
+                case PackageDexOptimizer.DEX_OPT_FAILED:
+                    numberOfPackagesFailed++;
+                    break;
+                default:
+                    Log.e(TAG, "Unexpected dexopt return code " + primaryDexOptStaus);
+                    break;
             }
         }