diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-03-25 18:13:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-25 18:13:18 +0000 |
| commit | a9f628662c348c5926caf5e2df0fd2f245a715bf (patch) | |
| tree | b1da0e5e0ba068eacbf56c55c7436a891174f4bd /core/java/android/security | |
| parent | 5aeb085389954a32e1ea2189b7bec8080b0226c5 (diff) | |
| parent | 403a494d5611b4d782981c39b4ed28b2340a32f9 (diff) | |
| download | frameworks_base-a9f628662c348c5926caf5e2df0fd2f245a715bf.zip frameworks_base-a9f628662c348c5926caf5e2df0fd2f245a715bf.tar.gz frameworks_base-a9f628662c348c5926caf5e2df0fd2f245a715bf.tar.bz2 | |
Merge "Framework's NetworkSecurityPolicy delegates to libcore's one."
Diffstat (limited to 'core/java/android/security')
| -rw-r--r-- | core/java/android/security/NetworkSecurityPolicy.java | 6 |
1 files changed, 2 insertions, 4 deletions
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 @@ 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); } } |