| commit | b0c4c78889033bf10a80919329f51ec831dd0ac6 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Dec 21 16:24:41 2016 -0800 |
| committer | Marco Nelissen <marcone@google.com> | Tue Dec 27 16:01:20 2016 +0000 |
| tree | 73c44daab25e7b107883306c5538209d631b5332 | |
| parent | 514a04e3e79fda49f129c24bbb2f23806c3fabf4 [diff] |
Wait for MediaPlayer.release before continuing to avoid creating another instance of a codec while the previous one has not been released yet. Bug: 32915871 Bug: 33809349 Change-Id: I26876d976f568c495febdb033df9a9c37cdb161e
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java index f65d73d..afc0ae4 100644 --- a/tests/tests/security/src/android/security/cts/StagefrightTest.java +++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -337,6 +337,7 @@ assertFalse("Device *IS* vulnerable to " + cve, mpcl.waitForError() == MediaPlayer.MEDIA_ERROR_SERVER_DIED); t.stopLooper(); + t.join(); // wait for thread to exit so we're sure the player was released } private void doStagefrightTestMediaCodec(final int rid) throws Exception {