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

Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs

Browse Source 
am: ce99e3c571

* commit 'ce99e3c57133b4418be4f0e2c8bc7dd9ea2815d2':
  Track changes to network security config manifest configuration

Change-Id: I6a09710dcef8b19c429f28fa90d72fd38284de3e
This commit is contained in:
Chad Brubaker
2016-05-26 04:37:17 +00:00
committed by android-build-merger
parent 1a045584d4 ce99e3c571
commit 11b56641e5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/html/preview/features/security-config.jd
View File

@@ -72,9 +72,8 @@ page.image=images/cards/card-nyc_2x.jpg
<pre> <pre>
&lt;?xml version="1.0" encoding="utf-8"?&gt; &lt;?xml version="1.0" encoding="utf-8"?&gt;
&lt;manifest ... &gt; &lt;manifest ... &gt;
&lt;application ... &gt; &lt;application android:networkSecurityConfig="@xml/network_security_config"
&lt;meta-data android:name="android.security.net.config" ... &gt;
android:resource="@xml/network_security_config" /&gt;
... ...
&lt;/application&gt; &lt;/application&gt;
&lt;/manifest&gt; &lt;/manifest&gt;