diff options
| author | Chalard Jean <jchalard@google.com> | 2019-05-28 09:38:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-28 09:38:51 +0000 |
| commit | 12c90b57d36cc79cbe7cbfc39fadd4c6fc02a116 (patch) | |
| tree | e718d4532f0645df7c0f87731321e6fd48843279 /core/java/android | |
| parent | dc90c9009baefcd103ac23d7ade0621d09ef42eb (diff) | |
| parent | 7ef65fba8a621c183a2b41d2614177b2c844000c (diff) | |
Merge "Reinstate access to a forgotten member" into qt-dev
Diffstat (limited to 'core/java/android')
| -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 fe42111afbad..050fcfa2527a 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 */ |