Snap for 8005954 from 9706e6072f295cf03e8cc5b25f01043687f484d4 to sdk-release
Change-Id: I4de1a074acb36eb36c54c5c2ca820724220e7639
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/common/statsd/StatsdTestUtils.java b/java/tests/instrumentation/src/com/android/textclassifier/common/statsd/StatsdTestUtils.java
index 1bcd7b7..ffd2ee4 100644
--- a/java/tests/instrumentation/src/com/android/textclassifier/common/statsd/StatsdTestUtils.java
+++ b/java/tests/instrumentation/src/com/android/textclassifier/common/statsd/StatsdTestUtils.java
@@ -28,6 +28,7 @@
import com.android.internal.os.StatsdConfigProto.SimpleAtomMatcher;
import com.android.internal.os.StatsdConfigProto.StatsdConfig;
import com.android.os.AtomsProto.Atom;
+import com.android.os.StatsLog.AggregatedAtomInfo;
import com.android.os.StatsLog.ConfigMetricsReport;
import com.android.os.StatsLog.ConfigMetricsReportList;
import com.android.os.StatsLog.EventMetricData;
@@ -85,6 +86,8 @@
return ImmutableList.copyOf(
metricsList.stream()
.flatMap(statsLogReport -> statsLogReport.getEventMetrics().getDataList().stream())
+ .flatMap(eventMetricData -> backfillAggregatedAtomsinEventMetric(
+ eventMetricData).stream())
.sorted(Comparator.comparing(EventMetricData::getElapsedTimestampNanos))
.map(EventMetricData::getAtom)
.collect(Collectors.toList()));
@@ -131,4 +134,20 @@
/*input=*/ null);
return ConfigMetricsReportList.parser().parseFrom(new ByteArrayInputStream(output));
}
+
+ private static ImmutableList<EventMetricData> backfillAggregatedAtomsinEventMetric(
+ EventMetricData metricData) {
+ if (metricData.hasAtom()) {
+ return ImmutableList.of(metricData);
+ }
+ ImmutableList.Builder<EventMetricData> data = ImmutableList.builder();
+ AggregatedAtomInfo atomInfo = metricData.getAggregatedAtomInfo();
+ for (long timestamp : atomInfo.getElapsedTimestampNanosList()) {
+ EventMetricData.Builder newMetricData = EventMetricData.newBuilder();
+ newMetricData.setAtom(atomInfo.getAtom());
+ newMetricData.setElapsedTimestampNanos(timestamp);
+ data.add(newMetricData.build());
+ }
+ return data.build();
+ }
}
diff --git a/native/AndroidTest.xml b/native/AndroidTest.xml
index 6f707e0..11893f5 100644
--- a/native/AndroidTest.xml
+++ b/native/AndroidTest.xml
@@ -20,14 +20,14 @@
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
- <option name="push" value="libtextclassifier_tests->/data/local/tests/unrestricted/libtextclassifier_tests" />
- <option name="push" value="actions->/data/local/tests/unrestricted/actions" />
- <option name="push" value="annotator->/data/local/tests/unrestricted/annotator" />
- <option name="push" value="utils->/data/local/tests/unrestricted/utils" />
+ <option name="push" value="libtextclassifier_tests->/data/local/tmp/libtextclassifier_tests" />
+ <option name="push" value="actions->/data/local/tmp/actions" />
+ <option name="push" value="annotator->/data/local/tmp/annotator" />
+ <option name="push" value="utils->/data/local/tmp/utils" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest" >
- <option name="native-test-device-path" value="/data/local/tests/unrestricted" />
+ <option name="native-test-device-path" value="/data/local/tmp" />
<option name="module-name" value="libtextclassifier_tests" />
</test>
