Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

Change-Id: I34d4fcdc103b3a6ea5c4ed78895f2fe18597237a
2015-08-18 11:08:10 -07:00
parent 9a010d0a41
commit af75c17bca
1 changed files with 3 additions and 0 deletions
--- 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];