diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-15 09:00:39 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-04-15 14:37:05 -0700 |
| commit | e35cefbf23ec2fe55e8be9e4d20fc9adf4374171 (patch) | |
| tree | 4cf2c415f4fedf031856c1e4ad340dfc43114895 /core/java/android/security | |
| parent | 2eabe5b7a9c396b1d6baebca7505a4e921312fc2 (diff) | |
| download | frameworks_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/security')
| -rw-r--r-- | core/java/android/security/NetworkSecurityPolicy.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/security/NetworkSecurityPolicy.java b/core/java/android/security/NetworkSecurityPolicy.java index 0b3bf45..70cd388 100644 --- a/core/java/android/security/NetworkSecurityPolicy.java +++ b/core/java/android/security/NetworkSecurityPolicy.java @@ -46,9 +46,9 @@ public class NetworkSecurityPolicy { * without TLS or STARTTLS) is permitted for this process. * * <p>When cleartext network traffic is not permitted, the platform's components (e.g. HTTP and - * FTP stacks, {@link android.webkit.WebView}, {@link android.media.MediaPlayer}) will refuse - * this process's requests to use cleartext traffic. Third-party libraries are strongly - * encouraged to honor this setting as well. + * FTP stacks, {@link android.webkit.WebView}, {@link android.app.DownloadManager}, + * {@link android.media.MediaPlayer}) will refuse this process's requests to use cleartext + * traffic. Third-party libraries are strongly encouraged to honor this setting as well. * * <p>This flag is honored on a best effort basis because it's impossible to prevent all * cleartext traffic from Android applications given the level of access provided to them. For |