[MS65.3] Address comments at aosp/1954383 (8de23851) · Commits · e / os / android_frameworks_base

packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java

+54 −15

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.net;		package android.net;

			import static android.net.ConnectivityManager.TYPE_MOBILE;
	import static android.net.ConnectivityManager.TYPE_WIFI;		import static android.net.ConnectivityManager.TYPE_WIFI;
	import static android.net.NetworkTemplate.NETWORK_TYPE_ALL;		import static android.net.NetworkTemplate.NETWORK_TYPE_ALL;

	@@ -30,6 +31,7 @@ import android.telephony.Annotation;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;
	import android.util.proto.ProtoOutputStream;		import android.util.proto.ProtoOutputStream;

			import com.android.net.module.util.CollectionUtils;
	import com.android.net.module.util.NetworkCapabilitiesUtils;		import com.android.net.module.util.NetworkCapabilitiesUtils;
	import com.android.net.module.util.NetworkIdentityUtils;		import com.android.net.module.util.NetworkIdentityUtils;

	@@ -55,7 +57,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {

	/** @hide */		/** @hide */
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	@IntDef(prefix = { "OEM_MANAGED_" }, value = {		@IntDef(prefix = { "OEM_MANAGED_" }, flag = true, value = {
	NetworkTemplate.OEM_MANAGED_NO,		NetworkTemplate.OEM_MANAGED_NO,
	NetworkTemplate.OEM_MANAGED_PAID,		NetworkTemplate.OEM_MANAGED_PAID,
	NetworkTemplate.OEM_MANAGED_PRIVATE		NetworkTemplate.OEM_MANAGED_PRIVATE
	@@ -71,12 +73,14 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	* Network has {@link NetworkCapabilities#NET_CAPABILITY_OEM_PAID}.		* Network has {@link NetworkCapabilities#NET_CAPABILITY_OEM_PAID}.
	* @hide		* @hide
	*/		*/
	public static final int OEM_PAID = 0x1;		public static final int OEM_PAID = 1 << 0;
	/**		/**
	* Network has {@link NetworkCapabilities#NET_CAPABILITY_OEM_PRIVATE}.		* Network has {@link NetworkCapabilities#NET_CAPABILITY_OEM_PRIVATE}.
	* @hide		* @hide
	*/		*/
	public static final int OEM_PRIVATE = 0x2;		public static final int OEM_PRIVATE = 1 << 1;

			private static final long SUPPORTED_OEM_MANAGED_TYPES = OEM_PAID \| OEM_PRIVATE;

	final int mType;		final int mType;
	final int mRatType;		final int mRatType;
	@@ -218,7 +222,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	return mRoaming;		return mRoaming;
	}		}

	/** Return the roaming status of this instance. */		/** Return whether this network is roaming. */
	public boolean isRoaming() {		public boolean isRoaming() {
	return mRoaming;		return mRoaming;
	}		}
	@@ -229,7 +233,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	return mMetered;		return mMetered;
	}		}

	/** Return the meteredness of this instance. */		/** Return whether this network is metered. */
	public boolean isMetered() {		public boolean isMetered() {
	return mMetered;		return mMetered;
	}		}
	@@ -240,7 +244,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	return mDefaultNetwork;		return mDefaultNetwork;
	}		}

	/** Return the default network status of this instance. */		/** Return whether this network is the default network. */
	public boolean isDefaultNetwork() {		public boolean isDefaultNetwork() {
	return mDefaultNetwork;		return mDefaultNetwork;
	}		}
	@@ -262,7 +266,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	* {@link TelephonyManager#NETWORK_TYPE_UNKNOWN} if not applicable.		* {@link TelephonyManager#NETWORK_TYPE_UNKNOWN} if not applicable.
	* See {@code TelephonyManager.NETWORK_TYPE_*}.		* See {@code TelephonyManager.NETWORK_TYPE_*}.
	* @hide		* @hide
	* @deprecated See {@link NetworkIdentity#Builder}.		* @deprecated See {@link NetworkIdentity.Builder}.
	*/		*/
	// TODO: Remove this after all callers are migrated to use new Api.		// TODO: Remove this after all callers are migrated to use new Api.
	@Deprecated		@Deprecated
	@@ -270,8 +274,12 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	public static NetworkIdentity buildNetworkIdentity(Context context,		public static NetworkIdentity buildNetworkIdentity(Context context,
	@NonNull NetworkStateSnapshot snapshot,		@NonNull NetworkStateSnapshot snapshot,
	boolean defaultNetwork, @Annotation.NetworkType int ratType) {		boolean defaultNetwork, @Annotation.NetworkType int ratType) {
	return new NetworkIdentity.Builder().setNetworkStateSnapshot(snapshot)		final NetworkIdentity.Builder builder = new NetworkIdentity.Builder()
	.setDefaultNetwork(defaultNetwork).setRatType(ratType).build();		.setNetworkStateSnapshot(snapshot).setDefaultNetwork(defaultNetwork);
			if (snapshot.getLegacyType() == TYPE_MOBILE && ratType != NETWORK_TYPE_ALL) {
			builder.setRatType(ratType);
			}
			return builder.build();
	}		}

	/**		/**
	@@ -323,6 +331,11 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	* Builder class for {@link NetworkIdentity}.		* Builder class for {@link NetworkIdentity}.
	*/		*/
	public static final class Builder {		public static final class Builder {
			// Need to be synchronized with ConnectivityManager.
			// TODO: Use {@link ConnectivityManager#MAX_NETWORK_TYPE} when this file is in the module.
			private static final int MAX_NETWORK_TYPE = 18; // TYPE_TEST
			private static final int MIN_NETWORK_TYPE = TYPE_MOBILE;

	private int mType;		private int mType;
	private int mRatType;		private int mRatType;
	private String mSubscriberId;		private String mSubscriberId;
	@@ -374,11 +387,9 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	.getTransportInfo();		.getTransportInfo();
	if (transportInfo instanceof WifiInfo) {		if (transportInfo instanceof WifiInfo) {
	final WifiInfo info = (WifiInfo) transportInfo;		final WifiInfo info = (WifiInfo) transportInfo;
	if (info != null) {
	setWifiNetworkKey(info.getNetworkKey());		setWifiNetworkKey(info.getNetworkKey());
	}		}
	}		}
	}
	return this;		return this;
	}		}

	@@ -391,6 +402,12 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	*/		*/
	@NonNull		@NonNull
	public Builder setType(int type) {		public Builder setType(int type) {
			// Include TYPE_NONE for compatibility, type field might not be filled by some
			// networks such as test networks.
			if ((type < MIN_NETWORK_TYPE \|\| MAX_NETWORK_TYPE < type)
			&& type != ConnectivityManager.TYPE_NONE) {
			throw new IllegalArgumentException("Invalid network type: " + type);
			}
	mType = type;		mType = type;
	return this;		return this;
	}		}
	@@ -405,6 +422,10 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	*/		*/
	@NonNull		@NonNull
	public Builder setRatType(@Annotation.NetworkType int ratType) {		public Builder setRatType(@Annotation.NetworkType int ratType) {
			if (!CollectionUtils.contains(TelephonyManager.getAllNetworkTypes(), ratType)
			&& ratType != TelephonyManager.NETWORK_TYPE_UNKNOWN) {
			throw new IllegalArgumentException("Invalid ratType " + ratType);
			}
	mRatType = ratType;		mRatType = ratType;
	return this;		return this;
	}		}
	@@ -447,7 +468,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	}		}

	/**		/**
	* Set the roaming.		* Set whether this network is roaming.
	*		*
	* @param roaming the roaming status of the network.		* @param roaming the roaming status of the network.
	* @return this builder.		* @return this builder.
	@@ -459,7 +480,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	}		}

	/**		/**
	* Set the meteredness.		* Set whether this network is metered.
	*		*
	* @param metered the meteredness of the network.		* @param metered the meteredness of the network.
	* @return this builder.		* @return this builder.
	@@ -471,7 +492,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	}		}

	/**		/**
	* Set the default network status.		* Set whether this network is the default network.
	*		*
	* @param defaultNetwork the default network status of the network.		* @param defaultNetwork the default network status of the network.
	* @return this builder.		* @return this builder.
	@@ -491,10 +512,27 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	*/		*/
	@NonNull		@NonNull
	public Builder setOemManaged(@OemManaged int oemManaged) {		public Builder setOemManaged(@OemManaged int oemManaged) {
			// Assert input does not contain illegal oemManage bits.
			if ((~SUPPORTED_OEM_MANAGED_TYPES & oemManaged) != 0) {
			throw new IllegalArgumentException("Invalid value for OemManaged : " + oemManaged);
			}
	mOemManaged = oemManaged;		mOemManaged = oemManaged;
	return this;		return this;
	}		}

			private void ensureValidParameters() {
			// Assert non-mobile network cannot have a ratType.
			if (mType != TYPE_MOBILE && mRatType != NetworkTemplate.NETWORK_TYPE_ALL) {
			throw new IllegalArgumentException(
			"Invalid ratType " + mRatType + " for type " + mType);
			}

			// Assert non-wifi network cannot have a wifi network key.
			if (mType != TYPE_WIFI && mWifiNetworkKey != null) {
			throw new IllegalArgumentException("Invalid wifi network key for type " + mType);
			}
			}

	/**		/**
	* Builds the instance of the {@link NetworkIdentity}.		* Builds the instance of the {@link NetworkIdentity}.
	*		*
	@@ -502,6 +540,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
	*/		*/
	@NonNull		@NonNull
	public NetworkIdentity build() {		public NetworkIdentity build() {
			ensureValidParameters();
	return new NetworkIdentity(mType, mRatType, mSubscriberId, mWifiNetworkKey,		return new NetworkIdentity(mType, mRatType, mSubscriberId, mWifiNetworkKey,
	mRoaming, mMetered, mDefaultNetwork, mOemManaged);		mRoaming, mMetered, mDefaultNetwork, mOemManaged);
	}		}

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+23 −23

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,6 @@ import static android.net.INetd.FIREWALL_RULE_DENY;
	import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;		import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
	import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING;		import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING;
	import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;		import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
	import static android.net.NetworkIdentity.OEM_NONE;
	import static android.net.NetworkPolicy.LIMIT_DISABLED;		import static android.net.NetworkPolicy.LIMIT_DISABLED;
	import static android.net.NetworkPolicy.SNOOZE_NEVER;		import static android.net.NetworkPolicy.SNOOZE_NEVER;
	import static android.net.NetworkPolicy.WARNING_DISABLED;		import static android.net.NetworkPolicy.WARNING_DISABLED;
	@@ -1518,13 +1517,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	for (int i = 0; i < mSubIdToSubscriberId.size(); i++) {		for (int i = 0; i < mSubIdToSubscriberId.size(); i++) {
	final int subId = mSubIdToSubscriberId.keyAt(i);		final int subId = mSubIdToSubscriberId.keyAt(i);
	final String subscriberId = mSubIdToSubscriberId.valueAt(i);		final String subscriberId = mSubIdToSubscriberId.valueAt(i);
	final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,		final NetworkIdentity probeIdent = new NetworkIdentity.Builder()
	TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true,		.setType(TYPE_MOBILE)
	true, OEM_NONE);		.setSubscriberId(subscriberId)
	/* While OEM_NONE indicates "any non OEM managed network", OEM_NONE is meant to be a		.setMetered(true)
	* placeholder value here. The probeIdent is matched against a NetworkTemplate which		.setDefaultNetwork(true).build();
	* should have its OEM managed value set to OEM_MANAGED_ALL, which will cause the
	* template to match probeIdent without regard to OEM managed status. */
	if (template.matches(probeIdent)) {		if (template.matches(probeIdent)) {
	return subId;		return subId;
	}		}
	@@ -1757,9 +1754,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

	// find and update the carrier NetworkPolicy for this subscriber id		// find and update the carrier NetworkPolicy for this subscriber id
	boolean policyUpdated = false;		boolean policyUpdated = false;
	final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,		final NetworkIdentity probeIdent = new NetworkIdentity.Builder()
	TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true, true,		.setType(TYPE_MOBILE)
	OEM_NONE);		.setSubscriberId(subscriberId)
			.setMetered(true)
			.setDefaultNetwork(true).build();
	for (int i = mNetworkPolicy.size() - 1; i >= 0; i--) {		for (int i = mNetworkPolicy.size() - 1; i >= 0; i--) {
	final NetworkTemplate template = mNetworkPolicy.keyAt(i);		final NetworkTemplate template = mNetworkPolicy.keyAt(i);
	if (template.matches(probeIdent)) {		if (template.matches(probeIdent)) {
	@@ -1987,10 +1986,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	for (int i = 0; i < mSubIdToSubscriberId.size(); i++) {		for (int i = 0; i < mSubIdToSubscriberId.size(); i++) {
	final int subId = mSubIdToSubscriberId.keyAt(i);		final int subId = mSubIdToSubscriberId.keyAt(i);
	final String subscriberId = mSubIdToSubscriberId.valueAt(i);		final String subscriberId = mSubIdToSubscriberId.valueAt(i);
			final NetworkIdentity probeIdent = new NetworkIdentity.Builder()
	final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,		.setType(TYPE_MOBILE)
	TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true,		.setSubscriberId(subscriberId)
	true, OEM_NONE);		.setMetered(true)
			.setDefaultNetwork(true).build();
	// Template is matched when subscriber id matches.		// Template is matched when subscriber id matches.
	if (template.matches(probeIdent)) {		if (template.matches(probeIdent)) {
	matchingSubIds.add(subId);		matchingSubIds.add(subId);
	@@ -2094,11 +2094,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	for (final NetworkStateSnapshot snapshot : snapshots) {		for (final NetworkStateSnapshot snapshot : snapshots) {
	mNetIdToSubId.put(snapshot.getNetwork().getNetId(), parseSubId(snapshot));		mNetIdToSubId.put(snapshot.getNetwork().getNetId(), parseSubId(snapshot));

	// Policies matched by NPMS only match by subscriber ID or by network ID. Thus subtype		// Policies matched by NPMS only match by subscriber ID or by network ID.
	// in the object created here is never used and its value doesn't matter, so use		final NetworkIdentity ident = new NetworkIdentity.Builder()
	// NETWORK_TYPE_UNKNOWN.		.setNetworkStateSnapshot(snapshot).setDefaultNetwork(true).build();
	final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, snapshot,
	true, TelephonyManager.NETWORK_TYPE_UNKNOWN /* subType */);
	identified.put(snapshot, ident);		identified.put(snapshot, ident);
	}		}

	@@ -2295,9 +2293,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	@GuardedBy("mNetworkPoliciesSecondLock")		@GuardedBy("mNetworkPoliciesSecondLock")
	private boolean ensureActiveCarrierPolicyAL(int subId, String subscriberId) {		private boolean ensureActiveCarrierPolicyAL(int subId, String subscriberId) {
	// Poke around to see if we already have a policy		// Poke around to see if we already have a policy
	final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,		final NetworkIdentity probeIdent = new NetworkIdentity.Builder()
	TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true, true,		.setType(TYPE_MOBILE)
	OEM_NONE);		.setSubscriberId(subscriberId)
			.setMetered(true)
			.setDefaultNetwork(true).build();
	for (int i = mNetworkPolicy.size() - 1; i >= 0; i--) {		for (int i = mNetworkPolicy.size() - 1; i >= 0; i--) {
	final NetworkTemplate template = mNetworkPolicy.keyAt(i);		final NetworkTemplate template = mNetworkPolicy.keyAt(i);
	if (template.matches(probeIdent)) {		if (template.matches(probeIdent)) {