commit 1cd6f13d3e99998c3986462301f3d27164a9524e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 31 22:02:50 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 31 22:02:50 2023 +0000
tree e2a9a09de99857e6b665b291b5f9971a71cb99d4
parent 87db5c25edb10ac4eeedcd8a4f3c6762eaf9da1e
parent 5059a0bc506cd239365b9f1b7e72f049e0e9ca24

Merge "Merge "CTS Verifier Tap-to-tone add overrides for report logging" into android12-tests-dev am: 99f84c89bc" into android12L-tests-dev

apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioTap2ToneActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioTap2ToneActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioTap2ToneActivity.java
index 20e12dc..170c232 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioTap2ToneActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioTap2ToneActivity.java
@@ -24,6 +24,9 @@
 import android.widget.RadioButton;
 import android.widget.TextView;
 
+import static com.android.cts.verifier.TestListActivity.sCurrentDisplayMode;
+import static com.android.cts.verifier.TestListAdapter.setTestNameSuffix;
+
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
 import com.android.cts.verifier.audio.audiolib.StatUtils;
@@ -123,6 +126,7 @@
     private double[] mLatencyMillis = new double[NUM_TEST_PHASES];
 
     // ReportLog Schema
+    private static final String SECTION_TAP_TO_TONE_LATENCY = "tap_to_tone_latency";
     // Note that each key will be suffixed with the ID of the API tested
     private static final String KEY_LATENCY_MIN = "latency_min_";
     private static final String KEY_LATENCY_MAX = "latency_max_";
@@ -263,7 +267,21 @@
         getPassButton().setEnabled(testCompleted);
     }
 
-    private void recordTestStatus() {
+    @Override
+    public String getTestId() {
+        return setTestNameSuffix(sCurrentDisplayMode, getClass().getName());
+    }
+
+    @Override
+    public String getReportFileName() { return PassFailButtons.AUDIO_TESTS_REPORT_LOG_NAME; }
+
+    @Override
+    public final String getReportSectionName() {
+        return setTestNameSuffix(sCurrentDisplayMode, SECTION_TAP_TO_TONE_LATENCY);
+    }
+
+    @Override
+    public void recordTestResults() {
         CtsVerifierReportLog reportLog = getReportLog();
         for (int api = TEST_API_NATIVE; api <= TEST_API_JAVA; api++) {
             reportLog.addValue(
@@ -438,7 +456,6 @@
     @Override
     public void setTestResultAndFinish(boolean passed) {
         stopAudio();
-        recordTestStatus();
         super.setTestResultAndFinish(passed);
     }