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

Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0

Browse Source 
am: 56f32483b0

* commit '56f32483b04723bf750e51badcfec3203c352d32':
  Fix incorrect cleartext attribute

Change-Id: I689b8df2a928e63b7c0b06198b06e2c6798bcba5
This commit is contained in:
Alex Klyubin
2016-05-25 18:24:31 +00:00
committed by android-build-merger
parent 5a00e9d345 56f32483b0
commit d1df52a46b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ page.image=images/cards/card-nyc_2x.jpg
</ol> </ol>
</li> </li>
<li><a href="#TrustingDebugCa">Debugging-only CAs</a></li> <li><a href="#TrustingDebugCa">Debugging-only CAs</a></li>
<li><a href="#UsesCleartextTraffic">Opting Out of Cleartext Traffic</a></li> <li><a href="#CleartextTrafficPermitted">Opting Out of Cleartext Traffic</a></li>
<li><a href="#CertificatePinning">Pinning Certificates</a></li> <li><a href="#CertificatePinning">Pinning Certificates</a></li>
<li><a href="#ConfigInheritance">Configuration Inheritance Behavior</a></li> <li><a href="#ConfigInheritance">Configuration Inheritance Behavior</a></li>
<li><a href="#FileFormat">Configuration File Format</a></li> <li><a href="#FileFormat">Configuration File Format</a></li>
@@ -240,7 +240,7 @@ android:debuggable</a>
</p> </p>
<h2 id="UsesCleartextTraffic">Opting Out of Cleartext Traffic</h2> <h2 id="CleartextTrafficPermitted">Opting Out of Cleartext Traffic</h2>
<p> <p>
Applications intending to connect to destinations using only secure Applications intending to connect to destinations using only secure
@@ -263,7 +263,7 @@ android:debuggable</a>
<pre> <pre>
&lt;?xml version="1.0" encoding="utf-8"?&gt; &lt;?xml version="1.0" encoding="utf-8"?&gt;
&lt;network-security-config&gt; &lt;network-security-config&gt;
&lt;domain-config usesCleartextTraffic="false"&gt; &lt;domain-config cleartextTrafficPermitted="false"&gt;
&lt;domain includeSubdomains="true"&gt;secure.example.com&lt;/domain&gt; &lt;domain includeSubdomains="true"&gt;secure.example.com&lt;/domain&gt;
&lt;/domain-config&gt; &lt;/domain-config&gt;
&lt;/network-security-config&gt; &lt;/network-security-config&gt;
@@ -436,7 +436,7 @@ android:debuggable</a>
<pre class="stx"> <pre class="stx">
&lt;base-config <a href= &lt;base-config <a href=
"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]&gt; "#CleartextTrafficPermitted">cleartextTrafficPermitted</a>=["true" | "false"]&gt;
... ...
&lt;/base-config&gt; &lt;/base-config&gt;
</pre> </pre>
@@ -463,7 +463,7 @@ android:debuggable</a>
</p> </p>
<pre> <pre>
&lt;base-config usesCleartextTraffic="true"&gt; &lt;base-config cleartextTrafficPermitted="true"&gt;
&lt;trust-anchors&gt; &lt;trust-anchors&gt;
&lt;certificates src="system" /&gt; &lt;certificates src="system" /&gt;
&lt;/trust-anchors&gt; &lt;/trust-anchors&gt;
@@ -471,7 +471,7 @@ android:debuggable</a>
</pre> </pre>
The default configuration for apps targeting API level 23 and below is: The default configuration for apps targeting API level 23 and below is:
<pre> <pre>
&lt;base-config usesCleartextTraffic="true"&gt; &lt;base-config cleartextTrafficPermitted="true"&gt;
&lt;trust-anchors&gt; &lt;trust-anchors&gt;
&lt;certificates src="system" /&gt; &lt;certificates src="system" /&gt;
&lt;certificates src="user" /&gt; &lt;certificates src="user" /&gt;
@@ -486,7 +486,7 @@ The default configuration for apps targeting API level 23 and below is:
<dl class="xml"> <dl class="xml">
<dt>syntax:</dt> <dt>syntax:</dt>
<dd> <dd>
<pre class="stx">&lt;domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" | "false"]&gt; <pre class="stx">&lt;domain-config <a href="#CleartextTrafficPermitted">cleartextTrafficPermitted</a>=["true" | "false"]&gt;
... ...
&lt;/domain-config&gt;</pre> &lt;/domain-config&gt;</pre>
</dd> </dd>