diff options
| author | Song Hu <songhu@google.com> | 2020-06-01 18:05:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-01 18:05:09 +0000 |
| commit | 005ce7cae6c6f2fe97858eecd39092f16a92765b (patch) | |
| tree | da019d14e90965ee52e35a5459b7ef6b8f07e351 /services/people | |
| parent | 83e9ba45a4f874ecd81aeda3a4ff7964b1eba3ba (diff) | |
| parent | 0c1b59a83a28f2e5b0f61161f37698839c0e9a46 (diff) | |
Merge "Return empty map when queryUsageStatsForUser returns null in UsageStatsQueryHelper#queryAppUsageStats." into rvc-dev
Diffstat (limited to 'services/people')
| -rw-r--r-- | services/people/java/com/android/server/people/data/UsageStatsQueryHelper.java | 3 |
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)) { |