commit 2193b07c21b5e67671848350fc3684c8ea783a7d
author Aaron Huang <huangaaron@google.com> Thu Nov 28 09:56:58 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 28 09:56:58 2019 +0000
tree 9957064fa172a200b942c23c9579e356e455f7e2
parent cd46b46d51db953937f8557cadb2391dd3d83ef4
parent 4c1dd06339735b829287c81b6737d3d772b444a2

Merge "Add IpConfiguration parcelable interface implementation to system API"

core/java/android/net/IpConfiguration.java

diff --git a/core/java/android/net/IpConfiguration.java b/core/java/android/net/IpConfiguration.java
index 143467b..dddb64d 100644
--- a/core/java/android/net/IpConfiguration.java
+++ b/core/java/android/net/IpConfiguration.java
@@ -191,18 +191,12 @@
                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());