CTS test fix for testStagefright_cve_2017_13279
Bug: 74612220
Test: sts-tradefed run sts-engbuild-no-spl-lock -m CtsSecurityTestCases -t android.security.cts.StagefrightTest#testStagefright_cve_2017_13279
Change-Id: I16e74e510de05bc104c262e1e2c25e73fb7b5f3d
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index f710d67..9793ec1 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -969,8 +969,11 @@
Thread server = new Thread() {
@Override
public void run(){
- try (ServerSocket serverSocket = new ServerSocket(8080);
- Socket conn = serverSocket.accept()){
+ try (ServerSocket serverSocket = new ServerSocket(8080) {
+ {setSoTimeout(10_000);} // time out after 10 seconds
+ };
+ Socket conn = serverSocket.accept()
+ ) {
OutputStream stream = conn.getOutputStream();
byte http[] = ("HTTP/1.0 200 OK\r\nContent-Type: application/x-mpegURL\r\n\r\n"
+ "#EXTM3U\n#EXT-X-STREAM-INF:\n").getBytes();