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

* commit '217d45685f176c7a2584b32a484c644f9f921265': Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest
2015-08-19 01:42:45 +00:00
parent efb71f442c 217d45685f
commit 1559f1c5a0
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];