diff options
| author | Chalard Jean <jchalard@google.com> | 2019-05-27 04:33:13 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-27 04:33:13 -0700 |
| commit | 41bd3c57b4ba347ac6eb4546855daf5473264a29 (patch) | |
| tree | 671540ea476e95aca00645102a86a219befff2c3 /core/java/android/net/StaticIpConfiguration.java | |
| parent | 170c2ee63ea945b6ac6d903528c342755c7afba2 (diff) | |
| parent | 2f4bd91b99b8990925e6bc78362688d8f05abfbe (diff) | |
Merge "Reinstate access to a forgotten member" am: ab6ab9e4d4
am: 2f4bd91b99
Change-Id: Ib279c0076016c53e0491fc0df8cefff8ae280d66
Diffstat (limited to 'core/java/android/net/StaticIpConfiguration.java')
| -rw-r--r-- | core/java/android/net/StaticIpConfiguration.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java index 73813d0cba48..d6deba5d41cc 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 */ |