summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chalard Jean <jchalard@google.com> 2019-05-27 04:28:05 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-27 04:28:05 -0700
commit2f4bd91b99b8990925e6bc78362688d8f05abfbe (patch)
treea3e558523e0f79809749677b49767e5c30cca0ed
parent0d018cdaecabc161962d40eaf5b6f90f3816d236 (diff)
parentab6ab9e4d41bb92ae52f5e649b9d34c80e6802c3 (diff)
Merge "Reinstate access to a forgotten member"
am: ab6ab9e4d4 Change-Id: Iad9203323f33a5f25ff080e21d046030e2a9be64
-rw-r--r--core/java/android/net/StaticIpConfiguration.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java
index baf7ae007343..0600036848d6 100644
--- a/core/java/android/net/StaticIpConfiguration.java
+++ b/core/java/android/net/StaticIpConfiguration.java
@@ -22,7 +22,6 @@ import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.net.shared.InetAddressUtils;
-import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
@@ -54,7 +53,7 @@ import java.util.Objects;
@TestApi
public final class StaticIpConfiguration implements Parcelable {
/** @hide */
- @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
+ @UnsupportedAppUsage
@Nullable
public LinkAddress ipAddress;
/** @hide */