diff options
| author | Erwin Jansen <jansene@google.com> | 2023-12-15 11:49:13 -0800 |
|---|---|---|
| committer | Erwin Jansen <jansene@google.com> | 2023-12-15 11:49:13 -0800 |
| commit | 3828327c300510e0d542f0e7c9a46e75363c7a96 (patch) | |
| tree | 3cecdfdd9c8114b079c2875e5c0737adb22ef0e7 /sdk/android/native_unittests/audio_device/audio_device_unittest.cc | |
| parent | 6b2545f8bc9c20c375497afad71e11d271ebf705 (diff) | |
| parent | 7e6315a61994be57daaf5fc491564cd543072be4 (diff) | |
| download | webrtc-3828327c300510e0d542f0e7c9a46e75363c7a96.tar.gz | |
Partial merge of WebRTC
This is a partial merge. This is needed since we do not accept changes
to OWNER files from the chrome domain, so those cannot come in a single
merge.
Change-Id: I37473f53ec79e422e8b77761a5859ebcd73f2e3e
Diffstat (limited to 'sdk/android/native_unittests/audio_device/audio_device_unittest.cc')
| -rw-r--r-- | sdk/android/native_unittests/audio_device/audio_device_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sdk/android/native_unittests/audio_device/audio_device_unittest.cc b/sdk/android/native_unittests/audio_device/audio_device_unittest.cc index 601f710d22..90476413a2 100644 --- a/sdk/android/native_unittests/audio_device/audio_device_unittest.cc +++ b/sdk/android/native_unittests/audio_device/audio_device_unittest.cc @@ -1154,7 +1154,8 @@ TEST_F(AudioDeviceTest, DISABLED_MeasureLoopbackLatency) { latency_audio_stream->PrintResults(); } -TEST(JavaAudioDeviceTest, TestRunningTwoAdmsSimultaneously) { +// TODO(https://crbug.com/webrtc/15537): test randomly fails. +TEST(JavaAudioDeviceTest, DISABLED_TestRunningTwoAdmsSimultaneously) { JNIEnv* jni = AttachCurrentThreadIfNeeded(); ScopedJavaLocalRef<jobject> context = GetAppContext(jni); |