Merge "Remove StringNetworkSpecifier"
am: bdbc3e7e4e
Change-Id: If2b9e1ef7341b517cb0090ba0ff882b1a6305ed4
This commit is contained in:
@@ -4708,15 +4708,6 @@ package android.net {
|
|||||||
method @NonNull public android.net.StaticIpConfiguration.Builder setIpAddress(@Nullable android.net.LinkAddress);
|
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 {
|
public final class TelephonyNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
|
||||||
method public boolean satisfiedBy(android.net.NetworkSpecifier);
|
method public boolean satisfiedBy(android.net.NetworkSpecifier);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
package android.net;
|
package android.net;
|
||||||
|
|
||||||
import android.annotation.NonNull;
|
import android.annotation.NonNull;
|
||||||
import android.annotation.SystemApi;
|
|
||||||
import android.os.Parcel;
|
import android.os.Parcel;
|
||||||
import android.os.Parcelable;
|
import android.os.Parcelable;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
@@ -27,7 +26,6 @@ import com.android.internal.util.Preconditions;
|
|||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/** @hide */
|
/** @hide */
|
||||||
@SystemApi
|
|
||||||
public final class StringNetworkSpecifier extends NetworkSpecifier implements Parcelable {
|
public final class StringNetworkSpecifier extends NetworkSpecifier implements Parcelable {
|
||||||
/**
|
/**
|
||||||
* Arbitrary string used to pass (additional) information to the network factory.
|
* Arbitrary string used to pass (additional) information to the network factory.
|
||||||
|
|||||||
Reference in New Issue
Block a user