Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79eee94e authored by Kevin Hufnagle's avatar Kevin Hufnagle Committed by android-build-merger
Browse files

Merge "docs: Clarified structure of security config file." into mnc-mr-docs am: c3cada0a 

am: 0e6f90e4

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

Change-Id: I0341bec1e4f609c4e6b7d7938687ac9ad1bf1b41
parents 41bd2372 0e6f90e4

docs/html/preview/features/security-config.jd

+4 −3
Original line number Diff line number Diff line
@@ -70,12 +70,13 @@ page.keywords=preview,security,network 


<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&gt;

&lt;/manifest&gt;

</pre>



<h2 id="CustomTrust">Customizing Trusted CAs</h2>