summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-16 22:28:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-16 22:28:06 +0000
commit35075a07659254413b587b7a6557a1b922d8757f (patch)
tree6fe97460e20aff5b2870261bba77f82ef0270fad /core/java/android/content
parent843b327ae29e6f8823db46ea357653c91c9a6958 (diff)
parente35cefbf23ec2fe55e8be9e4d20fc9adf4374171 (diff)
downloadframeworks_base-35075a07659254413b587b7a6557a1b922d8757f.zip
frameworks_base-35075a07659254413b587b7a6557a1b922d8757f.tar.gz
frameworks_base-35075a07659254413b587b7a6557a1b922d8757f.tar.bz2
Merge "Document usesCleartextTraffic app-level attribute."
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 caf069f..e2701ee 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -339,8 +339,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;