Use cleartextTrafficPermitted to enable clear text traffic
Test: cts tests
Bug: 79484673
Change-Id: Id4f5ea68c63b38fa3bc0dca5f8643423f30ed0f5
(cherry picked from commit af1e25211fad08808797dce1fd2b2a29da5204dc)
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 0033663..514db87a 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -83,7 +83,8 @@
<!-- Needed for Telecom self-managed ConnectionService tests. -->
<uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
- <application android:label="@string/app_name"
+ <application android:networkSecurityConfig="@xml/network_security_config"
+ android:label="@string/app_name"
android:icon="@drawable/icon"
android:debuggable="true"
android:largeHeap="true"
diff --git a/apps/CtsVerifier/res/xml/network_security_config.xml b/apps/CtsVerifier/res/xml/network_security_config.xml
new file mode 100644
index 0000000..c15c09c
--- /dev/null
+++ b/apps/CtsVerifier/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config cleartextTrafficPermitted="true"/>
+</network-security-config>
diff --git a/tests/tests/media/AndroidManifest.xml b/tests/tests/media/AndroidManifest.xml
index 6029327..eca5dd6 100644
--- a/tests/tests/media/AndroidManifest.xml
+++ b/tests/tests/media/AndroidManifest.xml
@@ -31,7 +31,7 @@
<uses-permission android:name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER" />
<uses-permission android:name="android.permission.SET_MEDIA_KEY_LISTENER" />
- <application android:usesCleartextTraffic="true">
+ <application android:networkSecurityConfig="@xml/network_security_config">
<uses-library android:name="android.test.runner" />
<uses-library android:name="org.apache.http.legacy" android:required="false" />
diff --git a/tests/tests/media/res/xml/network_security_config.xml b/tests/tests/media/res/xml/network_security_config.xml
new file mode 100644
index 0000000..c15c09c
--- /dev/null
+++ b/tests/tests/media/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config cleartextTrafficPermitted="true"/>
+</network-security-config>
