commit 6a7ac540e16cdf6a499580177f4e47a7f39d8554
author Alex Klyubin <klyubin@google.com> Wed Mar 25 19:03:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 25 19:03:34 2015 +0000
tree f7e2746b1f912afbfad00d3ce0c39beee4f03407
parent 9db6e4d7a331f4e219d938074e50b2f9deca45f1
parent a9f628662c348c5926caf5e2df0fd2f245a715bf

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

* commit 'a9f628662c348c5926caf5e2df0fd2f245a715bf':
  Framework's NetworkSecurityPolicy delegates to libcore's one.

core/java/android/security/NetworkSecurityPolicy.java

diff --git a/core/java/android/security/NetworkSecurityPolicy.java b/core/java/android/security/NetworkSecurityPolicy.java
index b26b10c..0626bbc 100644
--- a/core/java/android/security/NetworkSecurityPolicy.java
+++ b/core/java/android/security/NetworkSecurityPolicy.java
@@ -31,8 +31,6 @@
 
     private static final NetworkSecurityPolicy INSTANCE = new NetworkSecurityPolicy();
 
-    private volatile boolean mCleartextTrafficPermitted = true;
-
     private NetworkSecurityPolicy() {}
 
     /**
@@ -62,7 +60,7 @@
      * honor this aspect of the policy.
      */
     public boolean isCleartextTrafficPermitted() {
-        return mCleartextTrafficPermitted;
+        return libcore.net.NetworkSecurityPolicy.isCleartextTrafficPermitted();
     }
 
     /**
@@ -74,6 +72,6 @@
      * @hide
      */
     public void setCleartextTrafficPermitted(boolean permitted) {
-        mCleartextTrafficPermitted = permitted;
+        libcore.net.NetworkSecurityPolicy.setCleartextTrafficPermitted(permitted);
     }
 }