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

Commit 46c354f7 authored by Chad Brubaker's avatar Chad Brubaker Committed by android-build-merger
Browse files

Merge "Add stub isCTVerificationRequired methods" am: 5b63231a am: 6e1f860c 

am: 10943c69

Change-Id: I51870e48ab7519ef75e1a2643ab5af76918f46db
parents 7ce1521e 10943c69

core/java/android/security/FrameworkNetworkSecurityPolicy.java

+5 −0
Original line number Diff line number Diff line
@@ -37,4 +37,9 @@ public class FrameworkNetworkSecurityPolicy extends libcore.net.NetworkSecurityP 
    public boolean isCleartextTrafficPermitted(String hostname) {

        return isCleartextTrafficPermitted();

    }



    @Override

    public boolean isCertificateTransparencyVerificationRequired(String hostname) {

        return false;

    }

}

core/java/android/security/net/config/ConfigNetworkSecurityPolicy.java

+5 −0
Original line number Diff line number Diff line
@@ -37,4 +37,9 @@ public class ConfigNetworkSecurityPolicy extends libcore.net.NetworkSecurityPoli 
    public boolean isCleartextTrafficPermitted(String hostname) {

        return mConfig.isCleartextTrafficPermitted(hostname);

    }



    @Override

    public boolean isCertificateTransparencyVerificationRequired(String hostname) {

        return false;

    }

}