summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-15 09:00:39 -0700
committerAlex Klyubin <klyubin@google.com>2015-04-15 14:37:05 -0700
commite35cefbf23ec2fe55e8be9e4d20fc9adf4374171 (patch)
tree4cf2c415f4fedf031856c1e4ad340dfc43114895 /core/java/android/content
parent2eabe5b7a9c396b1d6baebca7505a4e921312fc2 (diff)
downloadframeworks_base-e35cefbf23ec2fe55e8be9e4d20fc9adf4374171.zip
frameworks_base-e35cefbf23ec2fe55e8be9e4d20fc9adf4374171.tar.gz
frameworks_base-e35cefbf23ec2fe55e8be9e4d20fc9adf4374171.tar.bz2
Document usesCleartextTraffic app-level attribute.
This updates the documentation of the application element of AndroidManifest.xml to mention the new android:usesCleartextTraffic attribute. This also updates the Javadoc of android.security.NetworkSecurityPolicy and ApplicationInfo to match. Bug: 19215516 Change-Id: I5c221b56addae8988b4db51994d18ae379d0fbe3
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/pm/ApplicationInfo.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index 5bdb7bb..3e2205e 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -338,8 +338,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
* (e.g., HTTP rather than HTTPS; WebSockets rather than WebSockets Secure; XMPP, IMAP, STMP
* without STARTTLS or TLS). If {@code false}, the app declares that it does not intend to use
* cleartext network traffic, in which case platform components (e.g., HTTP stacks,
- * {@code WebView}, {@code MediaPlayer}) will refuse app's requests to use cleartext traffic.
- * Third-party libraries are encouraged to honor this flag as well.
+ * {@code WebView}, {@code DownloadManager}, {@code MediaPlayer}) will refuse app's requests to
+ * use cleartext traffic. Third-party libraries are encouraged to honor this flag as well.
*/
public static final int FLAG_USES_CLEARTEXT_TRAFFIC = 1<<27;