am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit '4439dcdc395a9c173df1ddcf64c510eed5face07': Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest
2015-08-18 18:41:51 +00:00
parent 677cd08720 4439dcdc39
commit 8100b3fa8b
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];