summaryrefslogtreecommitdiff
path: root/services/people
diff options
context:
space:
mode:
authorSong Hu <songhu@google.com>2020-06-01 05:41:10 -0700
committerSong Hu <songhu@google.com>2020-06-01 05:41:10 -0700
commit0c1b59a83a28f2e5b0f61161f37698839c0e9a46 (patch)
tree95b6acadfda4b47535c901430ace50e8d4ceae81 /services/people
parent4f5af837be36aaf5c84cf236d25388a54cf4b688 (diff)
Return empty map when queryUsageStatsForUser returns null in UsageStatsQueryHelper#queryAppUsageStats.
Bug: 157877874 Test: atest com.android.server.people.data.UsageStatsQueryHelperTest Change-Id: Ib6574d18d42f6d2bd9041b53d43abcbb1db99323
Diffstat (limited to 'services/people')
-rw-r--r--services/people/java/com/android/server/people/data/UsageStatsQueryHelper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/people/java/com/android/server/people/data/UsageStatsQueryHelper.java b/services/people/java/com/android/server/people/data/UsageStatsQueryHelper.java
index d89bbe9dd14e..d008b72c6bad 100644
--- a/services/people/java/com/android/server/people/data/UsageStatsQueryHelper.java
+++ b/services/people/java/com/android/server/people/data/UsageStatsQueryHelper.java
@@ -148,6 +148,9 @@ class UsageStatsQueryHelper {
UsageStatsManager.INTERVAL_BEST, startTime, endTime,
/* obfuscateInstantApps= */ false);
Map<String, AppUsageStatsData> aggregatedStats = new ArrayMap<>();
+ if (stats == null) {
+ return aggregatedStats;
+ }
for (UsageStats stat : stats) {
String packageName = stat.getPackageName();
if (packageNameFilter.contains(packageName)) {