joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Expose DhcpInfo parcelable interface implementation methods" am: 617e9bd709 am: 6817693ef3

Browse source 
Change-Id: I6bf8b0646d2a9c9df8451feb51b05bf00739c4c3
This commit is contained in:
Automerger Merge Worker 2020-01-10 08:34:19 +00:00
commit badb0c36b6
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/java/android/net/DhcpInfo.java
View file

@ -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) {