diff options
Diffstat (limited to 'apps/CtsVerifier/src/com/android/cts/verifier/audio/ProAudioActivity.java')
-rw-r--r-- | apps/CtsVerifier/src/com/android/cts/verifier/audio/ProAudioActivity.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/ProAudioActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/ProAudioActivity.java index 126d15fdacb..e93d2b319ff 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/ProAudioActivity.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/ProAudioActivity.java @@ -158,11 +158,9 @@ public class ProAudioActivity boolean usbOK = mClaimsUSBHostMode && mClaimsUSBPeripheralMode; boolean hdmiOK = !mClaimsHDMI || isHDMIValid(); - boolean hasPassed = !mClaimsProAudio || - (mClaimsLowLatencyAudio && - mClaimsMIDI && - usbOK && - hdmiOK); + boolean hasPassed = isReportLogOkToPass() + && !mClaimsProAudio + || (mClaimsLowLatencyAudio && mClaimsMIDI && usbOK && hdmiOK); getPassButton().setEnabled(hasPassed); return hasPassed; @@ -172,7 +170,9 @@ public class ProAudioActivity boolean hasPassed = calculatePass(); Resources strings = getResources(); - if (hasPassed) { + if (!isReportLogOkToPass()) { + mTestStatusLbl.setText(getResources().getString(R.string.audio_general_reportlogtest)); + } else if (hasPassed) { mTestStatusLbl.setText(strings.getString(R.string.audio_proaudio_pass)); } else if (!mClaimsMIDI) { mTestStatusLbl.setText(strings.getString(R.string.audio_proaudio_midinotreported)); |