diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-04-09 20:10:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-09 20:10:15 +0000 |
| commit | e3f749d034ec5b78ea3575253241024c69b40248 (patch) | |
| tree | 3b4438828d2000cc5d86bddf9b8aee77336798db | |
| parent | cc2dcc454b1ffd7ef6d8e2af8c6a9c6b61608e02 (diff) | |
| parent | 626233f585eb0fbc6458104b0fe690f669759a5b (diff) | |
| download | cts-sparse-7272141-L99400000878537640.tar.gz | |
Merge "Snap for 7269854 from 3ed54c80eb420c83e2dc8147b5bca6d79ad6ebc1 to android10-tests-release" into android10-tests-releasesparse-7272141-L99400000878537640
| -rw-r--r-- | tests/tests/media/src/android/media/cts/AudioManagerTest.java | 11 | ||||
| -rw-r--r-- | tests/tests/media/src/android/media/cts/DecoderConformanceTest.java | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/tests/media/src/android/media/cts/AudioManagerTest.java b/tests/tests/media/src/android/media/cts/AudioManagerTest.java index 87c1baa26eb..05f4a48dfd2 100644 --- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java +++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java @@ -975,11 +975,22 @@ public class AudioManagerTest extends InstrumentationTestCase { } private void testStreamMuting(int stream) { + int minVolume = mAudioManager.getStreamMinVolume(stream); + // Voice call requires MODIFY_PHONE_STATE, so we should not be able to mute if (stream == AudioManager.STREAM_VOICE_CALL) { mAudioManager.adjustStreamVolume(stream, AudioManager.ADJUST_MUTE, 0); assertFalse("Muting voice call stream (" + stream + ") should require " + "MODIFY_PHONE_STATE.", mAudioManager.isStreamMute(stream)); + // non mutable stream + } else if (minVolume > 0) { + mAudioManager.adjustStreamVolume(stream, AudioManager.ADJUST_MUTE, 0); + assertFalse("Non mutable stream " + stream + " should not be muted.", + mAudioManager.isStreamMute(stream)); + mAudioManager.adjustStreamVolume(stream, AudioManager.ADJUST_TOGGLE_MUTE, 0); + assertFalse("Non mutable stream " + stream + " should not be muted by toggling mute.", + mAudioManager.isStreamMute(stream)); + } else { mAudioManager.adjustStreamVolume(stream, AudioManager.ADJUST_MUTE, 0); assertTrue("Muting stream " + stream + " failed.", diff --git a/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java b/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java index 58293f95f1f..998cba2597c 100644 --- a/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java +++ b/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java @@ -178,6 +178,7 @@ public class DecoderConformanceTest extends MediaPlayerTestBase { if (stat == Status.PASS) { pass = true; } else if (stat == Status.SKIP) { + release(); continue; } } catch (Exception e) { |