Merge "Expose DhcpInfo parcelable interface implementation methods" (44780ff9) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28796,6 +28796,7 @@ package android.net {
	ctor public DhcpInfo();		ctor public DhcpInfo();
	method public int describeContents();		method public int describeContents();
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);
			field @NonNull public static final android.os.Parcelable.Creator<android.net.DhcpInfo> CREATOR;
	field public int dns1;		field public int dns1;
	field public int dns2;		field public int dns2;
	field public int gateway;		field public int gateway;

core/java/android/net/DhcpInfo.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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) {