From 25e34339ba3e305c966d147eede3343803371ed2 Mon Sep 17 00:00:00 2001 From: Chad Brubaker Date: Tue, 5 Jan 2016 11:36:22 -0800 Subject: [PATCH] Unhide hostname aware isCleartextTrafficPermitted Change-Id: Id2bde5889d963ca2820fdecce1628dce022b510b --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/security/NetworkSecurityPolicy.java | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 30d302093272b..2fb33f8135067 100644 --- a/api/current.txt +++ b/api/current.txt @@ -33105,6 +33105,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 d7393b738d140..c66a326cc7668 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -35247,6 +35247,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 9058fe7d8b888..041655aa386f3 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -33108,6 +33108,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 46aa1af247de3..37ec72589570f 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()