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

Commit 2faa736e authored by Alex Klyubin's avatar Alex Klyubin Committed by Android Git Automerger
Browse files

am 6a7ac540: am a9f62866: Merge "Framework\'s NetworkSecurityPolicy delegates to libcore\'s one." 

* commit '6a7ac540':
  Framework's NetworkSecurityPolicy delegates to libcore's one.
parents c217adaf 6a7ac540

core/java/android/security/NetworkSecurityPolicy.java

+2 −4
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ public class NetworkSecurityPolicy { 


    private static final NetworkSecurityPolicy INSTANCE = new NetworkSecurityPolicy();



    private volatile boolean mCleartextTrafficPermitted = true;



    private NetworkSecurityPolicy() {}



    /**
@@ -62,7 +60,7 @@ public class NetworkSecurityPolicy { 
     * honor this aspect of the policy.

     */

    public boolean isCleartextTrafficPermitted() {

        return mCleartextTrafficPermitted;

        return libcore.net.NetworkSecurityPolicy.isCleartextTrafficPermitted();

    }



    /**
@@ -74,6 +72,6 @@ public class NetworkSecurityPolicy { 
     * @hide

     */

    public void setCleartextTrafficPermitted(boolean permitted) {

        mCleartextTrafficPermitted = permitted;

        libcore.net.NetworkSecurityPolicy.setCleartextTrafficPermitted(permitted);

    }

}