Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide hostname aware isCleartextTrafficPermitted"

Browse Source
This commit is contained in:
Chad Brubaker
2016-01-05 22:37:06 +00:00
committed by Android (Google) Code Review
parent 37bcaf3b6e 25e34339ba
commit 8885958f4b
4 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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);
}
}

1
api/system-current.txt
View File

@@ -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);
}
}

1
api/test-current.txt
View File

@@ -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);
}
}

1
core/java/android/security/NetworkSecurityPolicy.java
View File

@@ -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()