Merge "Reinstate access to a forgotten member"
This commit is contained in:
@@ -22,7 +22,6 @@ import android.annotation.SystemApi;
|
|||||||
import android.annotation.TestApi;
|
import android.annotation.TestApi;
|
||||||
import android.annotation.UnsupportedAppUsage;
|
import android.annotation.UnsupportedAppUsage;
|
||||||
import android.net.shared.InetAddressUtils;
|
import android.net.shared.InetAddressUtils;
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Parcel;
|
import android.os.Parcel;
|
||||||
import android.os.Parcelable;
|
import android.os.Parcelable;
|
||||||
|
|
||||||
@@ -54,7 +53,7 @@ import java.util.Objects;
|
|||||||
@TestApi
|
@TestApi
|
||||||
public final class StaticIpConfiguration implements Parcelable {
|
public final class StaticIpConfiguration implements Parcelable {
|
||||||
/** @hide */
|
/** @hide */
|
||||||
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
|
@UnsupportedAppUsage
|
||||||
@Nullable
|
@Nullable
|
||||||
public LinkAddress ipAddress;
|
public LinkAddress ipAddress;
|
||||||
/** @hide */
|
/** @hide */
|
||||||
|
|||||||
Reference in New Issue
Block a user