commit 35eb8d6205994c0cd147840dff45d09a1a2ca705
author Dianne Hackborn <hackbod@google.com> Wed Aug 19 02:21:23 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 19 02:21:23 2015 +0000
tree 7d1860799e3538a94d64b005df255136b457676a
parent fe6fd5d29d1ddefa52243ce7f6a3da91d188723d
parent 1559f1c5a0a4db23b8338b8c4792dcb351c541f8

am 1559f1c5: am 217d4568: am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit '1559f1c5a0a4db23b8338b8c4792dcb351c541f8':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

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 8e475e6..8b37ec4 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];