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

Merge "Return empty map when queryUsageStatsForUser returns null in UsageStatsQueryHelper#queryAppUsageStats." into rvc-dev am: 005ce7cae6 am: c635db5b80 am: 1898ea1cd3

Browse Source 
Change-Id: Ia8d1e1f77db99494ee44ebdf1ac6755593c47362
This commit is contained in:
Song Hu
2020-06-01 19:09:45 +00:00
committed by Automerger Merge Worker
parent f46937a27c 1898ea1cd3
commit 8bc035bd99
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/people/java/com/android/server/people/data/UsageStatsQueryHelper.java
View File

@@ -148,6 +148,9 @@ class UsageStatsQueryHelper {
UsageStatsManager.INTERVAL_BEST, startTime, endTime, UsageStatsManager.INTERVAL_BEST, startTime, endTime,
/* obfuscateInstantApps= */ false); /* obfuscateInstantApps= */ false);
Map<String, AppUsageStatsData> aggregatedStats = new ArrayMap<>(); Map<String, AppUsageStatsData> aggregatedStats = new ArrayMap<>();
if (stats == null) {
return aggregatedStats;
}
for (UsageStats stat : stats) { for (UsageStats stat : stats) {
String packageName = stat.getPackageName(); String packageName = stat.getPackageName();
if (packageNameFilter.contains(packageName)) { if (packageNameFilter.contains(packageName)) {

15
services/tests/servicestests/src/com/android/server/people/data/UsageStatsQueryHelperTest.java
View File

@@ -18,6 +18,8 @@ package com.android.server.people.data;
import static com.android.server.people.data.TestUtils.timestamp; import static com.android.server.people.data.TestUtils.timestamp;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@@ -235,6 +237,19 @@ public final class UsageStatsQueryHelperTest {
assertEquals(5, (long) appLaunchChooserCountCounts.get(PKG_NAME_1).getLaunchCount()); assertEquals(5, (long) appLaunchChooserCountCounts.get(PKG_NAME_1).getLaunchCount());
} }
@Test
public void testQueryAppUsageStats_nullUsageStats() {
when(mUsageStatsManagerInternal.queryUsageStatsForUser(anyInt(), anyInt(), anyLong(),
anyLong(), anyBoolean())).thenReturn(null);
Map<String, AppUsageStatsData> appLaunchChooserCountCounts =
mHelper.queryAppUsageStats(USER_ID_PRIMARY, 90_000L,
200_000L,
Set.of(PKG_NAME_1));
assertThat(appLaunchChooserCountCounts).isEmpty();
}
private void addUsageEvents(UsageEvents.Event... events) { private void addUsageEvents(UsageEvents.Event... events) {
UsageEvents usageEvents = new UsageEvents(Arrays.asList(events), new String[]{}); UsageEvents usageEvents = new UsageEvents(Arrays.asList(events), new String[]{});
when(mUsageStatsManagerInternal.queryEventsForUser(anyInt(), anyLong(), anyLong(), when(mUsageStatsManagerInternal.queryEventsForUser(anyInt(), anyLong(), anyLong(),