Merge "Keep existing policy when calling setCleartextTrafficPermitted" into main (83208063) · Commits · e / os / android_frameworks_base

core/java/android/security/NetworkSecurityPolicy.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,10 @@ public class NetworkSecurityPolicy {
		* @hide
		*/
		public void setCleartextTrafficPermitted(boolean permitted) {
		FrameworkNetworkSecurityPolicy policy = new FrameworkNetworkSecurityPolicy(permitted);
		libcore.net.NetworkSecurityPolicy currentPolicy =
		libcore.net.NetworkSecurityPolicy.getInstance();
		OverlayNetworkSecurityPolicy policy =
		new OverlayNetworkSecurityPolicy(currentPolicy, permitted);
		libcore.net.NetworkSecurityPolicy.setInstance(policy);
		}

+8 −5

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2015, The Android Open Source Project
		* Copyright (c) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -21,10 +21,13 @@ package android.security;
		*
		* @hide
		*/
		public class FrameworkNetworkSecurityPolicy extends libcore.net.NetworkSecurityPolicy {
		public class OverlayNetworkSecurityPolicy extends libcore.net.NetworkSecurityPolicy {
		private final libcore.net.NetworkSecurityPolicy mParent;
		private final boolean mCleartextTrafficPermitted;

		public FrameworkNetworkSecurityPolicy(boolean cleartextTrafficPermitted) {
		public OverlayNetworkSecurityPolicy(libcore.net.NetworkSecurityPolicy
		policy, boolean cleartextTrafficPermitted) {
		mParent = policy;
		mCleartextTrafficPermitted = cleartextTrafficPermitted;
		}

		@@ -40,6 +43,6 @@ public class FrameworkNetworkSecurityPolicy extends libcore.net.NetworkSecurityP

		@Override
		public boolean isCertificateTransparencyVerificationRequired(String hostname) {
		return false;
		return mParent.isCertificateTransparencyVerificationRequired(hostname);
		}
		}