Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev

Browse Source 
am: 300ab58e9a

Change-Id: Ib8fd78e9d876ce986d443a8422330b7d69a44c10
This commit is contained in:
Robert Shih
2018-05-25 16:15:40 -07:00
committed by android-build-merger
parent 3f3f1ebc17 300ab58e9a
commit 5ecf175573
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/tests/MediaFrameworkTest/AndroidManifest.xml
View File

@@ -24,7 +24,7 @@
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<application>
<application android:networkSecurityConfig="@xml/network_security_config">
<uses-library android:name="android.test.runner" />
<activity android:label="@string/app_name"
android:name="MediaFrameworkTest"

4
media/tests/MediaFrameworkTest/res/xml/network_security_config.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<base-config cleartextTrafficPermitted="true"/>
</network-security-config>