Merge "Add a Builder to NetworkAgentConfig, and make it SystemApi." (cae0b367) · Commits · e / os / android_frameworks_base

api/system-current.txt

+17 −0

Original line number	Diff line number	Diff line
		@@ -4957,6 +4957,23 @@ package android.net {
		field public final int netId;
		}

		public final class NetworkAgentConfig implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public String getSubscriberId();
		method public boolean isNat64DetectionEnabled();
		method public boolean isProvisioningNotificationEnabled();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkAgentConfig> CREATOR;
		}

		public static class NetworkAgentConfig.Builder {
		ctor public NetworkAgentConfig.Builder();
		method @NonNull public android.net.NetworkAgentConfig build();
		method @NonNull public android.net.NetworkAgentConfig.Builder disableNat64Detection();
		method @NonNull public android.net.NetworkAgentConfig.Builder disableProvisioningNotification();
		method @NonNull public android.net.NetworkAgentConfig.Builder setSubscriberId(@Nullable String);
		}

		public final class NetworkCapabilities implements android.os.Parcelable {
		method public boolean deduceRestrictedCapability();
		method @NonNull public int[] getTransportTypes();

core/java/android/net/NetworkAgentConfig.java

+99 −5

Original line number	Diff line number	Diff line
		@@ -18,22 +18,27 @@ package android.net;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.text.TextUtils;

		/**
		* A grab-bag of information (metadata, policies, properties, etc) about a
		* {@link Network}. Since this contains PII, it should not be sent outside the
		* system.
		* Allows a network transport to provide the system with policy and configuration information about
		* a particular network when registering a {@link NetworkAgent}. This information cannot change once
		* the agent is registered.
		*
		* @hide
		*/
		public class NetworkAgentConfig implements Parcelable {
		@SystemApi
		public final class NetworkAgentConfig implements Parcelable {

		/**
		* If the {@link Network} is a VPN, whether apps are allowed to bypass the
		* VPN. This is set by a {@link VpnService} and used by
		* {@link ConnectivityManager} when creating a VPN.
		*
		* @hide
		*/
		public boolean allowBypass;

		@@ -43,6 +48,8 @@ public class NetworkAgentConfig implements Parcelable {
		* ap in the wifi settings to trigger a connection is explicit. A 3rd party app asking to
		* connect to a particular access point is also explicit, though this may change in the future
		* as we want apps to use the multinetwork apis.
		*
		* @hide
		*/
		public boolean explicitlySelected;

		@@ -50,12 +57,16 @@ public class NetworkAgentConfig implements Parcelable {
		* Set if the user desires to use this network even if it is unvalidated. This field has meaning
		* only if {@link explicitlySelected} is true. If it is, this field must also be set to the
		* appropriate value based on previous user choice.
		*
		* @hide
		*/
		public boolean acceptUnvalidated;

		/**
		* Whether the user explicitly set that this network should be validated even if presence of
		* only partial internet connectivity.
		*
		* @hide
		*/
		public boolean acceptPartialConnectivity;

		@@ -65,29 +76,62 @@ public class NetworkAgentConfig implements Parcelable {
		* procedure, a carrier specific provisioning notification will be placed.
		* only one notification should be displayed. This field is set based on
		* which notification should be used for provisioning.
		*
		* @hide
		*/
		public boolean provisioningNotificationDisabled;

		/**
		*
		* @return whether the sign in to network notification is enabled by this configuration.
		*/
		public boolean isProvisioningNotificationEnabled() {
		return !provisioningNotificationDisabled;
		}

		/**
		* For mobile networks, this is the subscriber ID (such as IMSI).
		*
		* @hide
		*/
		public String subscriberId;

		/**
		* @return the subscriber ID, or null if none.
		*/
		@Nullable
		public String getSubscriberId() {
		return subscriberId;
		}

		/**
		* Set to skip 464xlat. This means the device will treat the network as IPv6-only and
		* will not attempt to detect a NAT64 via RFC 7050 DNS lookups.
		*
		* @hide
		*/
		public boolean skip464xlat;

		/**
		* @return whether NAT64 prefix detection is enabled.
		*/
		public boolean isNat64DetectionEnabled() {
		return !skip464xlat;
		}

		/**
		* Set to true if the PRIVATE_DNS_BROKEN notification has shown for this network.
		* Reset this bit when private DNS mode is changed from strict mode to opportunistic/off mode.
		*
		* @hide
		*/
		public boolean hasShownBroken;

		/** @hide */
		public NetworkAgentConfig() {
		}

		/** @hide */
		public NetworkAgentConfig(@Nullable NetworkAgentConfig nac) {
		if (nac != null) {
		allowBypass = nac.allowBypass;
		@@ -99,13 +143,63 @@ public class NetworkAgentConfig implements Parcelable {
		}
		}

		/**
		* Builder class to facilitate constructing {@link NetworkAgentConfig} objects.
		*/
		public static class Builder {
		private final NetworkAgentConfig mConfig = new NetworkAgentConfig();

		/**
		* Sets the subscriber ID for this network.
		*
		* @return this builder, to facilitate chaining.
		*/
		@NonNull
		public Builder setSubscriberId(@Nullable String subscriberId) {
		mConfig.subscriberId = subscriberId;
		return this;
		}

		/**
		* Disables active detection of NAT64 (e.g., via RFC 7050 DNS lookups). Used to save power
		* and reduce idle traffic on networks that are known to be IPv6-only without a NAT64.
		*
		* @return this builder, to facilitate chaining.
		*/
		@NonNull
		public Builder disableNat64Detection() {
		mConfig.skip464xlat = true;
		return this;
		}

		/**
		* Disables the "Sign in to network" notification. Used if the network transport will
		* perform its own carrier-specific provisioning procedure.
		*
		* @return this builder, to facilitate chaining.
		*/
		@NonNull
		public Builder disableProvisioningNotification() {
		mConfig.provisioningNotificationDisabled = true;
		return this;
		}

		/**
		* Returns the constructed {@link NetworkAgentConfig} object.
		*/
		@NonNull
		public NetworkAgentConfig build() {
		return mConfig;
		}
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		public void writeToParcel(@NonNull Parcel out, int flags) {
		out.writeInt(allowBypass ? 1 : 0);
		out.writeInt(explicitlySelected ? 1 : 0);
		out.writeInt(acceptUnvalidated ? 1 : 0);

tests/net/java/com/android/server/connectivity/LingerMonitorTest.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import android.net.ConnectivityManager;
		import android.net.IDnsResolver;
		import android.net.INetd;
		import android.net.Network;
		import android.net.NetworkAgentConfig;
		import android.net.NetworkCapabilities;
		import android.net.NetworkInfo;
		import android.net.NetworkProvider;
		@@ -75,7 +74,6 @@ public class LingerMonitorTest {
		@Mock INetd mNetd;
		@Mock INetworkManagementService mNMS;
		@Mock Context mCtx;
		@Mock NetworkAgentConfig mAgentConfig;
		@Mock NetworkNotificationManager mNotifier;
		@Mock Resources mResources;

		@@ -358,7 +356,7 @@ public class LingerMonitorTest {
		NetworkScore ns = new NetworkScore();
		ns.putIntExtension(NetworkScore.LEGACY_SCORE, 50);
		NetworkAgentInfo nai = new NetworkAgentInfo(null, null, new Network(netId), info, null,
		caps, ns, mCtx, null, mAgentConfig, mConnService, mNetd, mDnsResolver, mNMS,
		caps, ns, mCtx, null, null /* config */, mConnService, mNetd, mDnsResolver, mNMS,
		NetworkProvider.ID_NONE);
		nai.everValidated = true;
		return nai;

tests/net/java/com/android/server/connectivity/Nat464XlatTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,6 @@ public class Nat464XlatTest {
		static final int NETID = 42;

		@Mock ConnectivityService mConnectivity;
		@Mock NetworkAgentConfig mAgentConfig;
		@Mock IDnsResolver mDnsResolver;
		@Mock INetd mNetd;
		@Mock INetworkManagementService mNms;
		@@ -72,6 +71,7 @@ public class Nat464XlatTest {

		TestLooper mLooper;
		Handler mHandler;
		NetworkAgentConfig mAgentConfig = new NetworkAgentConfig();

		Nat464Xlat makeNat464Xlat() {
		return new Nat464Xlat(mNai, mNetd, mDnsResolver, mNms) {