From bfcda39cadd897cc89f77b40909a84fa8f56aace Mon Sep 17 00:00:00 2001
From: Peter Visontay <pvisontay@google.com>
Date: Wed, 2 Mar 2011 18:53:37 +0000
Subject: Fixed NPE in ActivityManager's launch count service.

Bug: 3497127
Change-Id: I38661fb0654e807f05cc57e43cff912de8d39096
---
 core/java/android/app/ActivityManager.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 77dc08486810..930c6b0591ac 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);
             }
 
-- 
cgit v1.2.3-59-g8ed1b