Merge "Add Restricted Mode handling to NetworkPolicyManager" (6e158b5a) · Commits · e / os / android_frameworks_base

core/java/android/net/NetworkPolicyManager.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -122,17 +122,26 @@ public class NetworkPolicyManager {
		* @hide
		*/
		public static final int RULE_REJECT_ALL = 1 << 6;
		/**
		* Reject traffic on all networks for restricted networking mode.
		*/
		public static final int RULE_REJECT_RESTRICTED_MODE = 1 << 10;

		/**
		* Mask used to get the {@code RULE_xxx_METERED} rules
		* @hide
		*/
		public static final int MASK_METERED_NETWORKS = 0b00001111;
		public static final int MASK_METERED_NETWORKS = 0b000000001111;
		/**
		* Mask used to get the {@code RULE_xxx_ALL} rules
		* @hide
		*/
		public static final int MASK_ALL_NETWORKS = 0b11110000;
		public static final int MASK_ALL_NETWORKS = 0b000011110000;
		/**
		* Mask used to get the {@code RULE_xxx_RESTRICTED_MODE} rules
		* @hide
		*/
		public static final int MASK_RESTRICTED_MODE_NETWORKS = 0b111100000000;

		/** @hide */
		public static final int FIREWALL_RULE_DEFAULT = 0;

+11 −0

Original line number	Diff line number	Diff line
		@@ -14627,6 +14627,17 @@ public final class Settings {
		*/
		public static final String MAXIMUM_OBSCURING_OPACITY_FOR_TOUCH =
		"maximum_obscuring_opacity_for_touch";

		/**
		* Used to enable / disable the Restricted Networking Mode in which network access is
		* restricted to apps holding the CONNECTIVITY_USE_RESTRICTED_NETWORKS permission.
		*
		* Values are:
		* 0: disabled
		* 1: enabled
		* @hide
		*/
		public static final String RESTRICTED_NETWORKING_MODE = "restricted_networking_mode";
		}

		/**

+1 −0

Original line number	Diff line number	Diff line
		@@ -146,5 +146,6 @@ public class GlobalSettingsValidators {
		VALIDATORS.put(Global.CUSTOM_BUGREPORT_HANDLER_USER, ANY_INTEGER_VALIDATOR);
		VALIDATORS.put(Global.DEVELOPMENT_SETTINGS_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.NOTIFICATION_FEEDBACK_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.RESTRICTED_NETWORKING_MODE, BOOLEAN_VALIDATOR);
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -420,6 +420,7 @@ public class SettingsBackupTest {
		Settings.Global.RADIO_WIMAX,
		Settings.Global.RECOMMENDED_NETWORK_EVALUATOR_CACHE_EXPIRY_MS,
		Settings.Global.READ_EXTERNAL_STORAGE_ENFORCED_DEFAULT,
		Settings.Global.RESTRICTED_NETWORKING_MODE,
		Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT,
		Settings.Global.SAFE_BOOT_DISALLOWED,
		Settings.Global.SELINUX_STATUS,

+3 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ public class NetworkPolicyLogger {
		static final int NTWK_BLOCKED_BG_RESTRICT = 5;
		static final int NTWK_ALLOWED_DEFAULT = 6;
		static final int NTWK_ALLOWED_SYSTEM = 7;
		static final int NTWK_BLOCKED_RESTRICTED_MODE = 8;

		private final LogBuffer mNetworkBlockedBuffer = new LogBuffer(MAX_NETWORK_BLOCKED_LOG_SIZE);
		private final LogBuffer mUidStateChangeBuffer = new LogBuffer(MAX_LOG_SIZE);
		@@ -281,6 +282,8 @@ public class NetworkPolicyLogger {
		return "blocked when background is restricted";
		case NTWK_ALLOWED_DEFAULT:
		return "allowed by default";
		case NTWK_BLOCKED_RESTRICTED_MODE:
		return "blocked by restricted networking mode";
		default:
		return String.valueOf(reason);
		}