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