Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd2a5c7c authored by Sam Saccone's avatar Sam Saccone Committed by android-build-merger
Browse files

Merge "Revert "Annotate StringNetworkSpecifier @Deprecated and @removed"" 

am: 1413b254

Change-Id: I6f7ffbb68e8e87410009ad74e5019d24cab55ca1
parents 7222dbc0 1413b254

api/system-current.txt

+9 −0
Original line number Diff line number Diff line
@@ -4641,6 +4641,15 @@ 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);















  }

































api/system-removed.txt



+0
−12




























Original line number
Diff line number
Diff line








@@ -130,18 +130,6 @@ 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 {

































core/java/android/net/StringNetworkSpecifier.java



+1
−10




























Original line number
Diff line number
Diff line








@@ -26,16 +26,7 @@ import com.android.internal.util.Preconditions;





























import java.util.Objects;





























/**













 * @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













/** @hide */















@SystemApi















public final class StringNetworkSpecifier extends NetworkSpecifier implements Parcelable {















    /**