Merge "Expose NetworkSpecifier methods as SystemApi" (ba9707e9) · Commits · e / os / android_frameworks_base

api/system-current.txt

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4823,6 +4823,7 @@ package android.net {
	public final class MatchAllNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {		public final class MatchAllNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
	ctor public MatchAllNetworkSpecifier();		ctor public MatchAllNetworkSpecifier();
	method public int describeContents();		method public int describeContents();
			method public boolean satisfiedBy(android.net.NetworkSpecifier);
	method public void writeToParcel(@NonNull android.os.Parcel, int);		method public void writeToParcel(@NonNull android.os.Parcel, int);
	field @NonNull public static final android.os.Parcelable.Creator<android.net.MatchAllNetworkSpecifier> CREATOR;		field @NonNull public static final android.os.Parcelable.Creator<android.net.MatchAllNetworkSpecifier> CREATOR;
	}		}
	@@ -4886,6 +4887,12 @@ package android.net {
	method public void updateScores(@NonNull java.util.List<android.net.ScoredNetwork>);		method public void updateScores(@NonNull java.util.List<android.net.ScoredNetwork>);
	}		}

			public abstract class NetworkSpecifier {
			method public void assertValidFromUid(int);
			method @Nullable public android.net.NetworkSpecifier redact();
			method public abstract boolean satisfiedBy(@Nullable android.net.NetworkSpecifier);
			}

	public class NetworkStack {		public class NetworkStack {
	field public static final String PERMISSION_MAINLINE_NETWORK_STACK = "android.permission.MAINLINE_NETWORK_STACK";		field public static final String PERMISSION_MAINLINE_NETWORK_STACK = "android.permission.MAINLINE_NETWORK_STACK";
	}		}
	@@ -4956,6 +4963,7 @@ package android.net {
	public final class StringNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {		public final class StringNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
	ctor public StringNetworkSpecifier(@NonNull String);		ctor public StringNetworkSpecifier(@NonNull String);
	method public int describeContents();		method public int describeContents();
			method public boolean satisfiedBy(android.net.NetworkSpecifier);
	method public void writeToParcel(@NonNull android.os.Parcel, int);		method public void writeToParcel(@NonNull android.os.Parcel, int);
	field @NonNull public static final android.os.Parcelable.Creator<android.net.StringNetworkSpecifier> CREATOR;		field @NonNull public static final android.os.Parcelable.Creator<android.net.StringNetworkSpecifier> CREATOR;
	field @NonNull public final String specifier;		field @NonNull public final String specifier;
	@@ -6073,6 +6081,10 @@ package android.net.wifi {
	field public int numUsage;		field public int numUsage;
	}		}

			public final class WifiNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
			method public boolean satisfiedBy(android.net.NetworkSpecifier);
			}

	public static final class WifiNetworkSuggestion.Builder {		public static final class WifiNetworkSuggestion.Builder {
	method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_CARRIER_PROVISIONING) public android.net.wifi.WifiNetworkSuggestion.Builder setCarrierId(int);		method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_CARRIER_PROVISIONING) public android.net.wifi.WifiNetworkSuggestion.Builder setCarrierId(int);
	}		}
	@@ -6259,6 +6271,10 @@ package android.net.wifi.aware {
	method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierPmk(@NonNull android.net.wifi.aware.PeerHandle, @NonNull byte[]);		method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierPmk(@NonNull android.net.wifi.aware.PeerHandle, @NonNull byte[]);
	}		}

			public final class WifiAwareNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
			method public boolean satisfiedBy(android.net.NetworkSpecifier);
			}

	public class WifiAwareSession implements java.lang.AutoCloseable {		public class WifiAwareSession implements java.lang.AutoCloseable {
	method public android.net.NetworkSpecifier createNetworkSpecifierPmk(int, @NonNull byte[], @NonNull byte[]);		method public android.net.NetworkSpecifier createNetworkSpecifierPmk(int, @NonNull byte[], @NonNull byte[]);
	}		}

core/java/android/net/NetworkSpecifier.java

+8 −1

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

	package android.net;		package android.net;

			import android.annotation.Nullable;
			import android.annotation.SystemApi;

	/**		/**
	* Describes specific properties of a requested network for use in a {@link NetworkRequest}.		* Describes specific properties of a requested network for use in a {@link NetworkRequest}.
	*		*
	@@ -31,7 +34,8 @@ public abstract class NetworkSpecifier {
	*		*
	* @hide		* @hide
	*/		*/
	public abstract boolean satisfiedBy(NetworkSpecifier other);		@SystemApi
			public abstract boolean satisfiedBy(@Nullable NetworkSpecifier other);

	/**		/**
	* Optional method which can be overridden by concrete implementations of NetworkSpecifier to		* Optional method which can be overridden by concrete implementations of NetworkSpecifier to
	@@ -45,6 +49,7 @@ public abstract class NetworkSpecifier {
	*		*
	* @hide		* @hide
	*/		*/
			@SystemApi
	public void assertValidFromUid(int requestorUid) {		public void assertValidFromUid(int requestorUid) {
	// empty		// empty
	}		}
	@@ -68,6 +73,8 @@ public abstract class NetworkSpecifier {
	*		*
	* @hide		* @hide
	*/		*/
			@SystemApi
			@Nullable
	public NetworkSpecifier redact() {		public NetworkSpecifier redact() {
	// TODO (b/122160111): convert default to null once all platform NetworkSpecifiers		// TODO (b/122160111): convert default to null once all platform NetworkSpecifiers
	// implement this method.		// implement this method.