Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '8100b3fa8be63b5c3525997b35d216edfc0cd7e7':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest
This commit is contained in:
Dianne Hackborn
2015-08-19 01:31:27 +00:00
committed by Android Git Automerger
parent 3244dc229a 8100b3fa8b
commit 217d45685f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/usage/java/com/android/server/usage/UsageStatsService.java
View File

@@ -848,6 +848,9 @@ public class UsageStatsService extends SystemService implements
try { try {
ParceledListSlice<ApplicationInfo> slice ParceledListSlice<ApplicationInfo> slice
= AppGlobals.getPackageManager().getInstalledApplications(0, userId); = AppGlobals.getPackageManager().getInstalledApplications(0, userId);
if (slice == null) {
return new int[0];
}
apps = slice.getList(); apps = slice.getList();
} catch (RemoteException e) { } catch (RemoteException e) {
return new int[0]; return new int[0];