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

Merge "Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 am: 86bceb87ca am: 62ac808954" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-05-26 05:18:00 +00:00
committed by Android (Google) Code Review
parent 45dddfa8f1 2fbded264d
commit 6367c659af
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;