Merge "Fix for Frequency Tests to match CDD requirements" into marshmallow-cts-dev
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index f4d7825..874f8cd 100644
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -2092,6 +2092,10 @@
<string name="audio_general_headset_port_exists">Does this device have a headset port?</string>
<string name="audio_general_headset_no">No</string>
<string name="audio_general_headset_yes">Yes</string>
+ <string name="audio_general_deficiency_found">WARNING: Some results show potential deficiencies on the system.
+ Please consider addressing them for a future release.</string>
+ <string name="audio_general_test_passed">Test Successful</string>
+ <string name="audio_general_test_failed">Test Failed</string>
<!-- Audio Loopback Latency Test -->
<string name="audio_loopback_test">Audio Loopback Latency Test</string>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyLineActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyLineActivity.java
index 508fae0..edb3bf0 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyLineActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyLineActivity.java
@@ -22,8 +22,8 @@
import com.android.compatibility.common.util.ReportLog;
import com.android.compatibility.common.util.ResultType;
import com.android.compatibility.common.util.ResultUnit;
-import android.content.Context;
+import android.content.Context;
import android.media.AudioDeviceCallback;
import android.media.AudioDeviceInfo;
import android.media.AudioFormat;
@@ -31,17 +31,13 @@
import android.media.AudioTrack;
import android.media.AudioRecord;
import android.media.MediaRecorder;
-
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.os.SystemClock;
-
import android.util.Log;
-
import android.view.View;
import android.view.View.OnClickListener;
-
import android.widget.Button;
import android.widget.TextView;
import android.widget.SeekBar;
@@ -391,9 +387,15 @@
Results resultsRight = new Results("Right");
computeResultsForVector(mFreqAverage1, resultsRight);
if (resultsLeft.testAll() && resultsRight.testAll()) {
- //enable button
- getPassButton().setEnabled(true);
+ String strSuccess = getResources().getString(R.string.audio_general_test_passed);
+ appendResultsToScreen(strSuccess);
+ } else {
+ String strFailed = getResources().getString(R.string.audio_general_test_failed);
+ appendResultsToScreen(strFailed + "\n");
+ String strWarning = getResources().getString(R.string.audio_general_deficiency_found);
+ appendResultsToScreen(strWarning);
}
+ getPassButton().setEnabled(true); //Everybody passes! (for now...)
}
private void computeResultsForVector(VectorAverage freqAverage,Results results) {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencySpeakerActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencySpeakerActivity.java
index f9334b3..ba7b86d 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencySpeakerActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencySpeakerActivity.java
@@ -416,8 +416,15 @@
computeResultsForVector(mFreqAverageRight, resultsRight, false, bandSpecsArray);
if (resultsLeft.testAll() && resultsRight.testAll() && resultsBase.testAll()) {
//enable button
- getPassButton().setEnabled(true);
+ String strSuccess = getResources().getString(R.string.audio_general_test_passed);
+ appendResultsToScreen(strSuccess);
+ } else {
+ String strFailed = getResources().getString(R.string.audio_general_test_failed);
+ appendResultsToScreen(strFailed + "\n");
+ String strWarning = getResources().getString(R.string.audio_general_deficiency_found);
+ appendResultsToScreen(strWarning);
}
+ getPassButton().setEnabled(true); //Everybody passes! (for now...)
}
private void computeResultsForVector(VectorAverage freqAverage,Results results, boolean isBase,
