Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Look at last used app when filtering." into nyc-dev

Browse Source 
am: ce289e937e

* commit 'ce289e937ee6b001cd14824e5dec3c6010b51e61':
  Look at last used app when filtering.

Change-Id: I7c1c693cc76d5067733e5b424dbdac1dcb55c288
This commit is contained in:
Nicolas Geoffray
2016-05-31 11:36:38 +00:00
committed by android-build-merger
parent ff078da846 ce289e937e
commit 7c34fd3ccd
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
View File

@@ -34,6 +34,8 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
@@ -66,15 +68,15 @@ public class PackageManagerServiceUtils {
} }
private static void filterRecentlyUsedApps(Collection<PackageParser.Package> pkgs, private static void filterRecentlyUsedApps(Collection<PackageParser.Package> pkgs,
long estimatedPreviousSystemUseTime,
long dexOptLRUThresholdInMills) { long dexOptLRUThresholdInMills) {
// Filter out packages that aren't recently used. // Filter out packages that aren't recently used.
int total = pkgs.size(); int total = pkgs.size();
int skipped = 0; int skipped = 0;
long now = System.currentTimeMillis();
for (Iterator<PackageParser.Package> i = pkgs.iterator(); i.hasNext();) { for (Iterator<PackageParser.Package> i = pkgs.iterator(); i.hasNext();) {
PackageParser.Package pkg = i.next(); PackageParser.Package pkg = i.next();
long then = pkg.getLatestForegroundPackageUseTimeInMills(); long then = pkg.getLatestForegroundPackageUseTimeInMills();
if (then + dexOptLRUThresholdInMills < now) { if (then < estimatedPreviousSystemUseTime - dexOptLRUThresholdInMills) {
if (DEBUG_DEXOPT) { if (DEBUG_DEXOPT) {
Log.i(TAG, "Skipping dexopt of " + pkg.packageName + Log.i(TAG, "Skipping dexopt of " + pkg.packageName +
" last used in foreground: " + " last used in foreground: " +
@@ -82,6 +84,12 @@ public class PackageManagerServiceUtils {
} }
i.remove(); i.remove();
skipped++; skipped++;
} else {
if (DEBUG_DEXOPT) {
Log.i(TAG, "Will dexopt " + pkg.packageName +
" last used in foreground: " +
((then == 0) ? "never" : new Date(then)));
}
} }
} }
if (DEBUG_DEXOPT) { if (DEBUG_DEXOPT) {
@@ -136,8 +144,24 @@ public class PackageManagerServiceUtils {
// Filter out packages that aren't recently used, add all remaining apps. // Filter out packages that aren't recently used, add all remaining apps.
// TODO: add a property to control this? // TODO: add a property to control this?
if (packageManagerService.isHistoricalPackageUsageAvailable()) { if (!remainingPkgs.isEmpty() && packageManagerService.isHistoricalPackageUsageAvailable()) {
filterRecentlyUsedApps(remainingPkgs, SEVEN_DAYS_IN_MILLISECONDS); if (DEBUG_DEXOPT) {
Log.i(TAG, "Looking at historical package use");
}
// Get the package that was used last.
PackageParser.Package lastUsed = Collections.max(remainingPkgs, (pkg1, pkg2) ->
Long.compare(pkg1.getLatestForegroundPackageUseTimeInMills(),
pkg2.getLatestForegroundPackageUseTimeInMills()));
if (DEBUG_DEXOPT) {
Log.i(TAG, "Taking package " + lastUsed.packageName + " as reference in time use");
}
long estimatedPreviousSystemUseTime =
lastUsed.getLatestForegroundPackageUseTimeInMills();
// Be defensive if for some reason package usage has bogus data.
if (estimatedPreviousSystemUseTime != 0) {
filterRecentlyUsedApps(remainingPkgs, estimatedPreviousSystemUseTime,
SEVEN_DAYS_IN_MILLISECONDS);
}
} }
result.addAll(remainingPkgs); result.addAll(remainingPkgs);