commit 34d580ed935c7310091084518f898277c5d616aa
author Dianne Hackborn <hackbod@google.com> Tue Aug 18 11:08:10 2015 -0700
committer The Android Automerger <android-build@google.com> Tue Aug 18 17:51:10 2015 -0700
tree fa2e5897dbb14f0bd23638e0166a64b7dbf7c872
parent ac60ded146aa6ab379576c81acd1c6b540abaff9

Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

Change-Id: I34d4fcdc103b3a6ea5c4ed78895f2fe18597237a

services/usage/java/com/android/server/usage/UsageStatsService.java

diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java
index 85f0665..4146c1c0 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 @@
         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];