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

Browse Source 
am: c3cada0

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

Change-Id: Iae9f64995c9d2fb90ad0e37cff949f03f75cc999
This commit is contained in:
Kevin Hufnagle
2016-04-12 20:25:27 +00:00
committed by android-build-merger
parent de5da71abc c3cada0ae5
commit 0e6f90e461
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>