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

Merge "docs: Clarified structure of security config file." into mnc-mr-docs am: c3cada0 am: 0e6f90e am: d893d0c

Browse Source 
am: 7250c15

* commit '7250c15f6d4c0210af13ce8ec1f922f30d2537c9':
  docs: Clarified structure of security config file.

Change-Id: Iafd923cbdeaba6c5dedf90bd8f18f7497dcfb64d
This commit is contained in:
Kevin Hufnagle
2016-04-27 04:08:24 +00:00
committed by android-build-merger
parent 0b2e2654ae 7250c15f6d
commit de7a10eb08
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,12 +70,13 @@ page.keywords=preview,security,network
<pre>
&lt;?xml version="1.0" encoding="utf-8"?&gt;
...
&lt;application ...&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&gt;
&lt;/application&gt;
&lt;/manifest&gt;
</pre>
<h2 id="CustomTrust">Customizing Trusted CAs</h2>