commit 6510da58836f75a97fd6965f6f80f58270ffb49f
author Aaron Huang <huangaaron@google.com> Fri Jan 10 08:05:24 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 10 08:05:24 2020 +0000
tree 8e8b4c26358242715a638ea7245580dec5b825c3
parent a4885a0b8ec15bd24ba8ed7fe2f5c64f916bb41e
parent a397c7e03ac19c90a5b4ea58fd981ecd793cb3fd

Merge "Expose DhcpInfo parcelable interface implementation methods"

core/java/android/net/DhcpInfo.java

diff --git a/core/java/android/net/DhcpInfo.java b/core/java/android/net/DhcpInfo.java
index 98bab44..912df67 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 @@
         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 @@
         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) {