commit 67f26a2a14deb0eb2384ee47ac80dd1dd3da9a04
author Marco Nelissen <marcone@google.com> Wed Oct 09 23:50:25 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 09 23:50:25 2019 +0000
tree 0c7320ee1dc00692616976e4907c72c36f31cccc
parent 4cc4f606d64b52c1aa36ea66dc83f55a07c1db20
parent 4f1d27949c9acb465281872d7477a644d4956487

Merge "fix CtsSecurityTestCase[instant] test bug"

tests/tests/security/src/android/security/cts/StagefrightTest.java

diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index b33070f..9c43ba1 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -77,6 +77,7 @@
 
 import android.security.cts.R;
 
+import android.security.NetworkSecurityPolicy;
 
 /**
  * Verify that the device is not vulnerable to any known Stagefright
@@ -1052,6 +1053,8 @@
     }
 
     private void doStagefrightTest(final int rid) throws Exception {
+        NetworkSecurityPolicy policy = NetworkSecurityPolicy.getInstance();
+        policy.setCleartextTrafficPermitted(true);
         doStagefrightTestMediaPlayer(rid);
         doStagefrightTestMediaCodec(rid);
         doStagefrightTestMediaMetadataRetriever(rid);
@@ -1073,6 +1076,7 @@
         doStagefrightTestMediaPlayer(url);
         doStagefrightTestMediaCodec(url);
         doStagefrightTestMediaMetadataRetriever(url);
+        policy.setCleartextTrafficPermitted(false);
         server.shutdown();
     }