Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a9f628662c348c5926caf5e2df0fd2f245a715bf':
  Framework's NetworkSecurityPolicy delegates to libcore's one.
This commit is contained in:
Alex Klyubin
2015-03-25 19:03:34 +00:00
committed by Android Git Automerger
parent 9db6e4d7a3 a9f628662c
commit 6a7ac540e1
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/security/NetworkSecurityPolicy.java
View File

@@ -31,8 +31,6 @@ public class NetworkSecurityPolicy {
private static final NetworkSecurityPolicy INSTANCE = new NetworkSecurityPolicy(); private static final NetworkSecurityPolicy INSTANCE = new NetworkSecurityPolicy();
private volatile boolean mCleartextTrafficPermitted = true;
private NetworkSecurityPolicy() {} private NetworkSecurityPolicy() {}
/** /**
@@ -62,7 +60,7 @@ public class NetworkSecurityPolicy {
* honor this aspect of the policy. * honor this aspect of the policy.
*/ */
public boolean isCleartextTrafficPermitted() { public boolean isCleartextTrafficPermitted() {
return mCleartextTrafficPermitted; return libcore.net.NetworkSecurityPolicy.isCleartextTrafficPermitted();
} }
/** /**
@@ -74,6 +72,6 @@ public class NetworkSecurityPolicy {
* @hide * @hide
*/ */
public void setCleartextTrafficPermitted(boolean permitted) { public void setCleartextTrafficPermitted(boolean permitted) {
mCleartextTrafficPermitted = permitted; libcore.net.NetworkSecurityPolicy.setCleartextTrafficPermitted(permitted);
} }
} }