diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-01-28 21:15:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-01-28 21:15:27 +0000 |
| commit | e8e74d44fa9678260b485f7650aae2f10a4c83ed (patch) | |
| tree | 362e8f87644d38145536db7bc146695387201aaa | |
| parent | 8725227d8dde98d8a2c0d95f20e6a566b7404e63 (diff) | |
| parent | d84001736e167325aae20a514b09f58a3f646e46 (diff) | |
| download | platform_cts-android-vts-10.0_r3.tar.gz platform_cts-android-vts-10.0_r3.tar.bz2 platform_cts-android-vts-10.0_r3.zip | |
Merge "Snap for 6165738 from ec0c716cf40830c552516a441701850f47156562 to android10-tests-release" into android10-tests-releaseandroid-vts-10.0_r3
| -rw-r--r-- | apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BluetoothChatService.java | 2 | ||||
| -rw-r--r-- | tests/tests/media/libmediandkjni/native-mediadrm-jni.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BluetoothChatService.java b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BluetoothChatService.java index f2be547859f..e89fc9416e3 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BluetoothChatService.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BluetoothChatService.java @@ -548,12 +548,12 @@ public class BluetoothChatService { public void run() { Log.i(TAG, "BEGIN mConnectedThread"); - byte[] buffer = new byte[1024]; int bytes; // Keep listening to the InputStream while connected while (true) { try { + byte[] buffer = new byte[1024]; // Read from the InputStream bytes = mmInStream.read(buffer); diff --git a/tests/tests/media/libmediandkjni/native-mediadrm-jni.cpp b/tests/tests/media/libmediandkjni/native-mediadrm-jni.cpp index 6db5494a313..11b0c620bba 100644 --- a/tests/tests/media/libmediandkjni/native-mediadrm-jni.cpp +++ b/tests/tests/media/libmediandkjni/native-mediadrm-jni.cpp @@ -744,7 +744,7 @@ extern "C" jboolean Java_android_media_cts_NativeMediaDrmClearkeyTest_testClearK !gListenerGotValidExpiryTime || !gOnKeyChangeListenerOK) && count++ < 5) { // Prevents race condition when the event arrives late - usleep(2000); + usleep(10000); } if (!gGotVendorDefinedEvent) { |