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

Browse Source 
am: 0e6f90e

* commit '0e6f90e46150f04d86936f761202a7b689cbb2a7':
  docs: Clarified structure of security config file.

Change-Id: I7a3b632ec88aff8124afa5f79b58d35bd12a8433
This commit is contained in:
Kevin Hufnagle
2016-04-26 08:01:43 +00:00
committed by android-build-merger
parent c1877e7d7b 0e6f90e461
commit d893d0c5c4
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> <pre>
&lt;?xml version="1.0" encoding="utf-8"?&gt; &lt;?xml version="1.0" encoding="utf-8"?&gt;
... &lt;manifest ... &gt;
&lt;application ...&gt; &lt;application ... &gt;
&lt;meta-data android:name="android.security.net.config" &lt;meta-data android:name="android.security.net.config"
android:resource="@xml/network_security_config" /&gt; android:resource="@xml/network_security_config" /&gt;
... ...
&lt;/application&gt; &lt;/application&gt;
&lt;/manifest&gt;
</pre> </pre>
<h2 id="CustomTrust">Customizing Trusted CAs</h2> <h2 id="CustomTrust">Customizing Trusted CAs</h2>