Merge "Annotate StringNetworkSpecifier @Deprecated and @removed" am:... (4358533b) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −9

Original line number	Diff line number	Diff line
		@@ -5235,15 +5235,6 @@ package android.net {
		method @NonNull public android.net.StaticIpConfiguration.Builder setIpAddress(@Nullable android.net.LinkAddress);
		}

		public final class StringNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
		ctor public StringNetworkSpecifier(@NonNull String);
		method public int describeContents();
		method public boolean satisfiedBy(android.net.NetworkSpecifier);
		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 final String specifier;
		}

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,18 @@ package android.media.tv {

		}

		package android.net {

		@Deprecated public final class StringNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
		ctor public StringNetworkSpecifier(@NonNull String);
		method public int describeContents();
		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 final String specifier;
		}

		}

		package android.net.wifi {

		@Deprecated public class BatchedScanResult implements android.os.Parcelable {

+10 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,16 @@ import com.android.internal.util.Preconditions;

		import java.util.Objects;

		/** @hide */
		/**
		* @deprecated use other subclass of {@link android.net.NetworkSpecifier},
		* eg. {@link android.net.TelephonyNetworkSpecifier},
		* {@link android.net.wifi.WifiNetworkSpecifier} instead.
		* @see {@link android.net.NetworkRequest#setNetworkSpecifier(String)} for details.
		* @removed this class was tentatively made SystemApi in December 2019 in the scramble for
		* publishing mainline APIs, it should be removed before R release is published.
		* @hide
		*/
		@Deprecated
		@SystemApi
		public final class StringNetworkSpecifier extends NetworkSpecifier implements Parcelable {
		/**