diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2016-01-05 22:37:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-05 22:37:06 +0000 |
| commit | 8885958f4b69dc2f7fb4e4a3d47691695c19c433 (patch) | |
| tree | 589ce22df7bf0a5b707d8d801518d2649a239e40 /core/java/android | |
| parent | 37bcaf3b6e850cf51a09c3acd4bfd5d8caef2d04 (diff) | |
| parent | 25e34339ba3e305c966d147eede3343803371ed2 (diff) | |
Merge "Unhide hostname aware isCleartextTrafficPermitted"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/security/NetworkSecurityPolicy.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/security/NetworkSecurityPolicy.java b/core/java/android/security/NetworkSecurityPolicy.java index 46aa1af247de..37ec72589570 100644 --- a/core/java/android/security/NetworkSecurityPolicy.java +++ b/core/java/android/security/NetworkSecurityPolicy.java @@ -68,7 +68,6 @@ public class NetworkSecurityPolicy { * TLS or STARTTLS) is permitted for communicating with {@code hostname} for this process. * * @see #isCleartextTrafficPermitted() - * @hide */ public boolean isCleartextTrafficPermitted(String hostname) { return libcore.net.NetworkSecurityPolicy.getInstance() |