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

Merge "Fixed NPE in ActivityManager's launch count service."

Browse Source
This commit is contained in:
Bjorn Bringert
2011-03-03 00:10:03 -08:00
committed by Android (Google) Code Review
parent a2c322f599 bfcda39cad
commit 1dda71ae36
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/ActivityManager.java
View File

@@ -1253,8 +1253,13 @@ public class ActivityManager {
return new HashMap<String, Integer>();
}
PkgUsageStats[] allPkgUsageStats = usageStatsService.getAllPkgUsageStats();
if (allPkgUsageStats == null) {
return new HashMap<String, Integer>();
}
Map<String, Integer> launchCounts = new HashMap<String, Integer>();
for (PkgUsageStats pkgUsageStats : usageStatsService.getAllPkgUsageStats()) {
for (PkgUsageStats pkgUsageStats : allPkgUsageStats) {
launchCounts.put(pkgUsageStats.packageName, pkgUsageStats.launchCount);
}