Assert android:usesCleartextTraffic attribute works as expected.
The CTS tests were added a long time ago, but cts-tradefed did not
run them because they weren't listed in a special file.
Bug: 19215516
Change-Id: Ic5c36def2e82934c4f41d440c4496d97ac0cbca2
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 7378d9e..765dda0 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -19,6 +19,9 @@
CtsDocumentClient \
CtsExternalStorageApp \
CtsInstrumentationAppDiffCert \
+ CtsNetSecPolicyUsesCleartextTrafficFalse \
+ CtsNetSecPolicyUsesCleartextTrafficTrue \
+ CtsNetSecPolicyUsesCleartextTrafficUnspecified \
CtsUsePermissionApp \
CtsUsePermissionAppCompat \
CtsPermissionDeclareApp \
@@ -177,6 +180,9 @@
CtsMidiTestCases \
CtsNativeOpenGLTestCases \
CtsNdefTestCases \
+ CtsNetSecPolicyUsesCleartextTrafficFalseTestCases \
+ CtsNetSecPolicyUsesCleartextTrafficTrueTestCases \
+ CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases \
CtsNetTestCases \
CtsNetTestCasesLegacyApi22 \
CtsNetTestCasesLegacyPermission22 \
diff --git a/tests/netsecpolicy/usescleartexttraffic-false/AndroidManifest.xml b/tests/netsecpolicy/usescleartexttraffic-false/AndroidManifest.xml
index 013821e..c87b800 100644
--- a/tests/netsecpolicy/usescleartexttraffic-false/AndroidManifest.xml
+++ b/tests/netsecpolicy/usescleartexttraffic-false/AndroidManifest.xml
@@ -19,6 +19,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.netsecpolicy.usescleartext.false.cts">
<uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-library android:name="org.apache.http.legacy"/>
+
<application android:usesCleartextTraffic="false">
</application>
</manifest>
diff --git a/tests/netsecpolicy/usescleartexttraffic-true/AndroidManifest.xml b/tests/netsecpolicy/usescleartexttraffic-true/AndroidManifest.xml
index f50295e..da15ddd 100644
--- a/tests/netsecpolicy/usescleartexttraffic-true/AndroidManifest.xml
+++ b/tests/netsecpolicy/usescleartexttraffic-true/AndroidManifest.xml
@@ -19,6 +19,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.netsecpolicy.usescleartext.true.cts">
<uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-library android:name="org.apache.http.legacy"/>
<application android:usesCleartextTraffic="true">
diff --git a/tests/netsecpolicy/usescleartexttraffic-unspecified/AndroidManifest.xml b/tests/netsecpolicy/usescleartexttraffic-unspecified/AndroidManifest.xml
index 7e735c7..5b3a181 100644
--- a/tests/netsecpolicy/usescleartexttraffic-unspecified/AndroidManifest.xml
+++ b/tests/netsecpolicy/usescleartexttraffic-unspecified/AndroidManifest.xml
@@ -18,7 +18,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.netsecpolicy.usescleartext.unspecified.cts">
- <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-library android:name="org.apache.http.legacy"/>
+
<application>
</application>
</manifest>
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk b/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
index 0441f2b..01ea6b7 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
@@ -24,7 +24,7 @@
ctstestserver \
org.apache.http.legacy
-LOCAL_SRC_FILES := $(call all-java-files-under, src ../src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src common)
LOCAL_PACKAGE_NAME := CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-false/common b/tests/tests/netsecpolicy/usescleartexttraffic-false/common
new file mode 120000
index 0000000..5cd551cf
--- /dev/null
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-false/common
@@ -0,0 +1 @@
+../src
\ No newline at end of file
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk b/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
index 5a4a41d..9f53f18 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
@@ -24,7 +24,7 @@
ctstestserver \
org.apache.http.legacy
-LOCAL_SRC_FILES := $(call all-java-files-under, src ../src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src common)
LOCAL_PACKAGE_NAME := CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-true/common b/tests/tests/netsecpolicy/usescleartexttraffic-true/common
new file mode 120000
index 0000000..5cd551cf
--- /dev/null
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-true/common
@@ -0,0 +1 @@
+../src
\ No newline at end of file
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
index faa3c23..fe7d36e 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
@@ -24,7 +24,7 @@
ctstestserver \
org.apache.http.legacy
-LOCAL_SRC_FILES := $(call all-java-files-under, src ../src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src common)
LOCAL_PACKAGE_NAME := CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/common b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/common
new file mode 120000
index 0000000..5cd551cf
--- /dev/null
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/common
@@ -0,0 +1 @@
+../src
\ No newline at end of file
