commit e89ca4a279ceecc75b17500c92e3cb4ec23529a6
author Makoto Onuki <omakoto@google.com> Fri May 19 19:38:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 19 19:38:20 2017 +0000
tree b770c69b582eba90447639dc07d294e1a1845801
parent 41dbf5adab1eaf84e20dbf7d09fc49000fe44cb1
parent 75f7c57aef510d4c74d585a188fef1b597998ab7

Merge "Fix NPE in usage stats manager (recent regression)" into oc-dev am: 091050e92a
am: 75f7c57aef

Change-Id: I98fd109be4e512aabcb0c8f4b030ed7a89a6a906

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 0de3c7c..912e7a8 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -831,6 +831,9 @@
             final UserUsageStatsService service =
                     getUserDataAndInitializeIfNeededLocked(userId, timeNow);
             List<UsageStats> list = service.queryUsageStats(bucketType, beginTime, endTime);
+            if (list == null) {
+                return null;
+            }
 
             // Mangle instant app names *using their current state (not whether they were ephemeral
             // when the data was recorded)*.