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

Commit 403a494d authored by Alex Klyubin's avatar Alex Klyubin
Browse files

Framework's NetworkSecurityPolicy delegates to libcore's one. 

Now that the libcore's NetworkSecurityPolicy abstraction is in place,
the framework version of the abstraction should delegate to the
libcore one, to avoid them getting out of sync.

Bug: 19215516
Change-Id: Ic57341d703a13e0fb100dc414958e8fd54e03816
parent ff022cb1

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

    }

}