commit de03fbdf280a563cb67a5be3c89913a1978d7605
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 10 13:31:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 10 13:31:07 2018 +0000
tree e50940820726cac1e45f79dd248457dccd66694e
parent 4019e1461f72aeb74fad2f1cb6715bcfd86e6bb5
parent 8e3ea032e3fdf8559ad2d01862606f8624e5fb1c

Merge "Fix CTS-on-GSI testDownloadManager test run failure" into pie-cts-dev

tests/app/app/AndroidManifest.xml

diff --git a/tests/app/app/AndroidManifest.xml b/tests/app/app/AndroidManifest.xml
index e05b8b4..fe340c9 100644
--- a/tests/app/app/AndroidManifest.xml
+++ b/tests/app/app/AndroidManifest.xml
@@ -51,7 +51,7 @@
                 android:multiArch="true"
                 android:name="android.app.stubs.MockApplication"
                 android:supportsRtl="true"
-                android:usesCleartextTraffic="true">
+                android:networkSecurityConfig="@xml/network_security_config">
         <uses-library android:name="android.test.runner" />
         <uses-library android:name="org.apache.http.legacy" android:required="false" />
 

tests/app/app/res/xml/network_security_config.xml

diff --git a/tests/app/app/res/xml/network_security_config.xml b/tests/app/app/res/xml/network_security_config.xml
new file mode 100644
index 0000000..cb4b34f
--- /dev/null
+++ b/tests/app/app/res/xml/network_security_config.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+  <base-config cleartextTrafficPermitted="true">
+  </base-config>
+  <!-- Cleartext traffic is explicitly permitted to example.com and all subdomains -->
+  <domain-config cleartextTrafficPermitted="true">
+      <domain includeSubdomains="true">example.com</domain>
+  </domain-config>
+  <domain-config cleartextTrafficPermitted="true">
+      <domain includeSubdomains="true">localhost</domain>
+  </domain-config>
+</network-security-config>