Merge "Expose DhcpInfo parcelable interface implementation methods"

This commit is contained in:
Aaron Huang
2020-01-10 08:05:24 +00:00
committed by Gerrit Code Review

View File

@@ -16,8 +16,8 @@
package android.net; package android.net;
import android.os.Parcelable;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable;
/** /**
* A simple object for retrieving the results of a DHCP request. * 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()); buf.append(NetworkUtils.intToInetAddress(addr).getHostAddress());
} }
/** Implement the Parcelable interface {@hide} */ /** Implement the Parcelable interface */
public int describeContents() { public int describeContents() {
return 0; return 0;
} }
/** Implement the Parcelable interface {@hide} */ /** Implement the Parcelable interface */
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(ipAddress); dest.writeInt(ipAddress);
dest.writeInt(gateway); dest.writeInt(gateway);
@@ -83,7 +83,7 @@ public class DhcpInfo implements Parcelable {
dest.writeInt(leaseDuration); dest.writeInt(leaseDuration);
} }
/** Implement the Parcelable interface {@hide} */ /** Implement the Parcelable interface */
public static final @android.annotation.NonNull Creator<DhcpInfo> CREATOR = public static final @android.annotation.NonNull Creator<DhcpInfo> CREATOR =
new Creator<DhcpInfo>() { new Creator<DhcpInfo>() {
public DhcpInfo createFromParcel(Parcel in) { public DhcpInfo createFromParcel(Parcel in) {