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

Merge "Document when usesCleartextTraffic is ignored." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-12 19:18:13 +00:00
committed by Android (Google) Code Review
parent dfd72d4308 2df5ba777a
commit e341ddfa05
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/pm/ApplicationInfo.java
View File

@@ -366,6 +366,9 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
* *
* <p>NOTE: {@code WebView} does not honor this flag. * <p>NOTE: {@code WebView} does not honor this flag.
* *
* <p>This flag is ignored on Android N and above if an Android Network Security Config is
* present.
*
* <p>This flag comes from * <p>This flag comes from
* {@link android.R.styleable#AndroidManifestApplication_usesCleartextTraffic * {@link android.R.styleable#AndroidManifestApplication_usesCleartextTraffic
* android:usesCleartextTraffic} of the &lt;application&gt; tag. * android:usesCleartextTraffic} of the &lt;application&gt; tag.

2
docs/html/guide/topics/manifest/application-element.jd
View File

@@ -472,6 +472,8 @@ from {@link android.content.pm.ApplicationInfo#flags ApplicationInfo.flags} or
{@link android.os.StrictMode.VmPolicy.Builder#detectCleartextNetwork() StrictMode.VmPolicy.Builder.detectCleartextNetwork()}. {@link android.os.StrictMode.VmPolicy.Builder#detectCleartextNetwork() StrictMode.VmPolicy.Builder.detectCleartextNetwork()}.
<p>This attribute was added in API level 23.</p> <p>This attribute was added in API level 23.</p>
<p>This flag is ignored on Android N and above if an Android Network Security Config is present.</p>
</dd> </dd>
<dt><a name="vmSafeMode"></a>{@code android:vmSafeMode}</dt> <dt><a name="vmSafeMode"></a>{@code android:vmSafeMode}</dt>