Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8885958f authored by Chad Brubaker's avatar Chad Brubaker Committed by Android (Google) Code Review
Browse files

Merge "Unhide hostname aware isCleartextTrafficPermitted"

parents 37bcaf3b 25e34339

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

  }















}

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








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















  }





























}

























api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








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















  }





























}

























core/java/android/security/NetworkSecurityPolicy.java



+0
−1




























Original line number
Diff line number
Diff line








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