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 
am: 6367c659af

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

Change-Id: Iec52e971a28110eab0b29124e708e1d1379f1426
This commit is contained in:
Chad Brubaker
2016-05-26 05:44:08 +00:00
committed by android-build-merger
parent 5414dc989b 6367c659af
commit 5204f17fcc
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>
&lt;?xml version="1.0" encoding="utf-8"?&gt;
&lt;manifest ... &gt;
&lt;application ... &gt;
&lt;meta-data android:name="android.security.net.config"
android:resource="@xml/network_security_config" /&gt;
&lt;application android:networkSecurityConfig="@xml/network_security_config"
... &gt;
...
&lt;/application&gt;
&lt;/manifest&gt;