From a822bc131e7bf9be5277cb4f8dcb4777a71c80b0 Mon Sep 17 00:00:00 2001 From: Stanislav Zholnin Date: Mon, 28 Oct 2019 12:28:12 +0000 Subject: [PATCH] Change AppOps collection to include historical appops since beginning of time. Running totals are expected to work correctly with value metric. Change-Id: If86ec8721a4abf5eed644b05d3fe8a419e050213 Test: make statsd_testdrive && ./out/host/linux-x86/bin/statsd_testdrive 10060 --- .../com/android/server/stats/StatsCompanionService.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java index 1a10753d7bcb7..5e5a04b1af3b9 100644 --- a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java +++ b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java @@ -156,8 +156,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; -import java.time.Instant; -import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -2071,9 +2069,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { CompletableFuture ops = new CompletableFuture<>(); HistoricalOpsRequest histOpsRequest = - new HistoricalOpsRequest.Builder( - Instant.now().minus(1, ChronoUnit.HOURS).toEpochMilli(), - Long.MAX_VALUE).build(); + new HistoricalOpsRequest.Builder(0, Long.MAX_VALUE).build(); appOps.getHistoricalOps(histOpsRequest, mContext.getMainExecutor(), ops::complete); HistoricalOps histOps = ops.get(EXTERNAL_STATS_SYNC_TIMEOUT_MILLIS,