Merge "Framework's NetworkSecurityPolicy delegates to libcore's one." (a9f62866) · Commits · e / os / android_frameworks_base

core/java/android/security/NetworkSecurityPolicy.java

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}
	}		}