summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--api/test-current.txt1
-rw-r--r--core/java/android/security/NetworkSecurityPolicy.java1
4 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 730e84e10399..a77aa6e9eaba 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -33106,6 +33106,7 @@ package android.security {
public class NetworkSecurityPolicy {
method public static android.security.NetworkSecurityPolicy getInstance();
method public boolean isCleartextTrafficPermitted();
+ method public boolean isCleartextTrafficPermitted(java.lang.String);
}
}
diff --git a/api/system-current.txt b/api/system-current.txt
index c69cc87d0810..395ae81208c9 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -35242,6 +35242,7 @@ package android.security {
public class NetworkSecurityPolicy {
method public static android.security.NetworkSecurityPolicy getInstance();
method public boolean isCleartextTrafficPermitted();
+ method public boolean isCleartextTrafficPermitted(java.lang.String);
}
}
diff --git a/api/test-current.txt b/api/test-current.txt
index ac4ec6e532c6..9e260ef9678f 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -33109,6 +33109,7 @@ package android.security {
public class NetworkSecurityPolicy {
method public static android.security.NetworkSecurityPolicy getInstance();
method public boolean isCleartextTrafficPermitted();
+ method public boolean isCleartextTrafficPermitted(java.lang.String);
}
}
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()