From af75c17bca8b2f017e254131393cd72e2fe7c6e8 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Tue, 18 Aug 2015 11:08:10 -0700
Subject: Fix issue #23270878: NPE in UsageStatsService while running
 UserManagementTest

Change-Id: I34d4fcdc103b3a6ea5c4ed78895f2fe18597237a
---
 services/usage/java/com/android/server/usage/UsageStatsService.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'services/usage')

diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java
index 85f0665..4146c1c 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -848,6 +848,9 @@ public class UsageStatsService extends SystemService implements
         try {
             ParceledListSlice<ApplicationInfo> slice
                     = AppGlobals.getPackageManager().getInstalledApplications(0, userId);
+            if (slice == null) {
+                return new int[0];
+            }
             apps = slice.getList();
         } catch (RemoteException e) {
             return new int[0];
-- 
cgit v1.1