Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am:... (68143b86) · Commits · e / os / android_frameworks_base

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

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -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>
	<?xml version="1.0" encoding="utf-8"?>		<?xml version="1.0" encoding="utf-8"?>
	<network-security-config>		<network-security-config>
	<domain-config usesCleartextTraffic="false">		<domain-config cleartextTrafficPermitted="false">
	<domain includeSubdomains="true">secure.example.com</domain>		<domain includeSubdomains="true">secure.example.com</domain>
	</domain-config>		</domain-config>
	</network-security-config>		</network-security-config>
	@@ -436,7 +436,7 @@ android:debuggable</a>

	<pre class="stx">		<pre class="stx">
	<base-config <a href=		<base-config <a href=
	"#usesCleartextTraffic">usesCleartextTraffic</a>=["true" \| "false"]>		"#CleartextTrafficPermitted">cleartextTrafficPermitted</a>=["true" \| "false"]>
	...		...
	</base-config>		</base-config>
	</pre>		</pre>
	@@ -463,7 +463,7 @@ android:debuggable</a>
	</p>		</p>

	<pre>		<pre>
	<base-config usesCleartextTraffic="true">		<base-config cleartextTrafficPermitted="true">
	<trust-anchors>		<trust-anchors>
	<certificates src="system" />		<certificates src="system" />
	</trust-anchors>		</trust-anchors>
	@@ -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>
	<base-config usesCleartextTraffic="true">		<base-config cleartextTrafficPermitted="true">
	<trust-anchors>		<trust-anchors>
	<certificates src="system" />		<certificates src="system" />
	<certificates src="user" />		<certificates src="user" />
	@@ -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"><domain-config <a href="#usesCleartextTraffic">usesCleartextTraffic</a>=["true" \| "false"]>		<pre class="stx"><domain-config <a href="#CleartextTrafficPermitted">cleartextTrafficPermitted</a>=["true" \| "false"]>
	...		...
	</domain-config></pre>		</domain-config></pre>
	</dd>		</dd>