diff options
| author | Aaron Huang <huangaaron@google.com> | 2020-01-10 00:10:03 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2020-01-10 00:10:03 -0800 |
| commit | 19c2ed44eaca1644a2fcbb07b275dee15e0f5160 (patch) | |
| tree | 3af7d084240d5a6dc4014d3d731c8df91b2f742a /core/java/android | |
| parent | 23a2ee7ac2686254b3fbeb71799bf47c30ff76e1 (diff) | |
| parent | 44780ff9204342dc5f754d2321dfae2d4dd4dab8 (diff) | |
Merge "Expose DhcpInfo parcelable interface implementation methods"
am: 44780ff920
Change-Id: Ie432bee8641bd0c2e94adb04329ea6e80e8ed72c
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/DhcpInfo.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/net/DhcpInfo.java b/core/java/android/net/DhcpInfo.java index 98bab44e19fb..912df67a0b45 100644 --- a/core/java/android/net/DhcpInfo.java +++ b/core/java/android/net/DhcpInfo.java @@ -16,8 +16,8 @@ package android.net; -import android.os.Parcelable; import android.os.Parcel; +import android.os.Parcelable; /** * A simple object for retrieving the results of a DHCP request. @@ -67,12 +67,12 @@ public class DhcpInfo implements Parcelable { buf.append(NetworkUtils.intToInetAddress(addr).getHostAddress()); } - /** 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(Parcel dest, int flags) { dest.writeInt(ipAddress); dest.writeInt(gateway); @@ -83,7 +83,7 @@ public class DhcpInfo implements Parcelable { dest.writeInt(leaseDuration); } - /** Implement the Parcelable interface {@hide} */ + /** Implement the Parcelable interface */ public static final @android.annotation.NonNull Creator<DhcpInfo> CREATOR = new Creator<DhcpInfo>() { public DhcpInfo createFromParcel(Parcel in) { |