commit bfcda39cadd897cc89f77b40909a84fa8f56aace
author Peter Visontay <pvisontay@google.com> Wed Mar 02 18:53:37 2011 +0000
committer Peter Visontay <pvisontay@google.com> Wed Mar 02 19:06:36 2011 +0000
tree b39a2a03c71288a6fce0d095267aa364c9e4db8b
parent 0528bc77948e49bd75cfd4082fb8fef3a7238626

Fixed NPE in ActivityManager's launch count service.

Bug: 3497127
Change-Id: I38661fb0654e807f05cc57e43cff912de8d39096

core/java/android/app/ActivityManager.java

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 @@
                 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);
             }