Merge "Remove StringNetworkSpecifier" am: bdbc3e7e4e am: fa25f2f38c am: ec06afee8a

Change-Id: I60c9e49085701e05bddbed6a8735e6973e9f2986
This commit is contained in:
Automerger Merge Worker
2020-01-23 03:40:48 +00:00
2 changed files with 0 additions and 11 deletions

View File

@@ -6437,15 +6437,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);
}

View File

@@ -17,7 +17,6 @@
package android.net;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;
@@ -27,7 +26,6 @@ import com.android.internal.util.Preconditions;
import java.util.Objects;
/** @hide */
@SystemApi
public final class StringNetworkSpecifier extends NetworkSpecifier implements Parcelable {
/**
* Arbitrary string used to pass (additional) information to the network factory.