diff options
| author | Peter Visontay <pvisontay@google.com> | 2011-03-02 18:53:37 +0000 |
|---|---|---|
| committer | Peter Visontay <pvisontay@google.com> | 2011-03-02 19:06:36 +0000 |
| commit | bfcda39cadd897cc89f77b40909a84fa8f56aace (patch) | |
| tree | b39a2a03c71288a6fce0d095267aa364c9e4db8b /core/java/android/app | |
| parent | 0528bc77948e49bd75cfd4082fb8fef3a7238626 (diff) | |
| download | frameworks_base-bfcda39cadd897cc89f77b40909a84fa8f56aace.zip frameworks_base-bfcda39cadd897cc89f77b40909a84fa8f56aace.tar.gz frameworks_base-bfcda39cadd897cc89f77b40909a84fa8f56aace.tar.bz2 | |
Fixed NPE in ActivityManager's launch count service.
Bug: 3497127
Change-Id: I38661fb0654e807f05cc57e43cff912de8d39096
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 77dc084..930c6b0 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -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); } |