diff options
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/IpConfiguration.java | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 8a4d11c18c89..492354ae661a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4088,6 +4088,7 @@ package android.net { public final class IpConfiguration implements android.os.Parcelable { ctor public IpConfiguration(); ctor public IpConfiguration(@NonNull android.net.IpConfiguration); + method public int describeContents(); method @Nullable public android.net.ProxyInfo getHttpProxy(); method @NonNull public android.net.IpConfiguration.IpAssignment getIpAssignment(); method @NonNull public android.net.IpConfiguration.ProxySettings getProxySettings(); @@ -4096,6 +4097,7 @@ package android.net { method public void setIpAssignment(@NonNull android.net.IpConfiguration.IpAssignment); method public void setProxySettings(@NonNull android.net.IpConfiguration.ProxySettings); method public void setStaticIpConfiguration(@Nullable android.net.StaticIpConfiguration); + method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.net.IpConfiguration> CREATOR; } diff --git a/core/java/android/net/IpConfiguration.java b/core/java/android/net/IpConfiguration.java index 143467b15fe8..dddb64d8cece 100644 --- a/core/java/android/net/IpConfiguration.java +++ b/core/java/android/net/IpConfiguration.java @@ -191,18 +191,12 @@ public final class IpConfiguration implements Parcelable { 83 * httpProxy.hashCode(); } - /** - * Implement the Parcelable interface - * @hide - */ + /** Implement the Parcelable interface */ public int describeContents() { return 0; } - /** - * Implement the Parcelable interface - * @hide - */ + /** Implement the Parcelable interface */ public void writeToParcel(@NonNull Parcel dest, int flags) { dest.writeString(ipAssignment.name()); dest.writeString(proxySettings.name()); |