commit 186b54397a1cdfbf4cd97f2ce997c9537f41d3ed
author David Brazdil <dbrazdil@google.com> Thu Feb 11 15:08:37 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 11 15:08:38 2016 +0000
tree 39bf78739611e11f18c920ff2ed05c51650fbaaa
parent 2036dad877336bf4d81202c334b1f2c81462bd9f
parent b62d690e7e931a07a9503ccbd7cc107b1af3fc64

Merge "Address minor comments after go/ag/858723" into nyc-dev

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

diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
index 2c6d2b69..a3ac514 100644
--- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
+++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
@@ -44,8 +44,7 @@
  * {@hide}
  */
 public class PackageManagerServiceUtils {
-    // Apps used in the last 7 days.
-    private final static long DEXOPT_LRU_THRESHOLD_IN_MINUTES = 7 * 24 * 60;
+    private final static long SEVEN_DAYS_IN_MILLISECONDS = 7 * 24 * 60 * 60 * 1000;
 
     private static ArraySet<String> getPackageNamesForIntent(Intent intent, int userId) {
         List<ResolveInfo> ris = null;
@@ -81,7 +80,7 @@
             }
         }
         if (DEBUG_DEXOPT) {
-            Log.i(TAG, "Skipped optimizing " + skipped + " of " + total);
+            Log.i(TAG, "Skipped dexopt " + skipped + " of " + total);
         }
     }
 
@@ -121,7 +120,7 @@
         // Filter out packages that aren't recently used, add all remaining apps.
         // TODO: add a property to control this?
         if (packageManagerService.isHistoricalPackageUsageAvailable()) {
-            filterRecentlyUsedApps(remainingPkgs, DEXOPT_LRU_THRESHOLD_IN_MINUTES * 60 * 1000);
+            filterRecentlyUsedApps(remainingPkgs, SEVEN_DAYS_IN_MILLISECONDS);
         }
         result.addAll(remainingPkgs);
 
@@ -132,6 +131,8 @@
             dependencies.addAll(packageManagerService.findSharedNonSystemLibraries(p));
         }
         if (!dependencies.isEmpty()) {
+            // We might have packages already in `result` that are dependencies
+            // of other packages. Make sure we don't add those to the list twice.
             dependencies.removeAll(result);
         }
         result.addAll(dependencies);
@@ -144,7 +145,7 @@
                 }
                 sb.append(pkg.packageName);
             }
-            Log.i(TAG, "Packages to be optimized: " + sb.toString());
+            Log.i(TAG, "Packages to be dexopted: " + sb.toString());
         }
 
         return result;