Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose DhcpInfo parcelable interface implementation methods" am: 44780ff920 am: 19c2ed44ea

Browse Source 
Change-Id: I6bf8b0646d2a9c9df8451feb51b05bf00739c4c3
This commit is contained in:
Automerger Merge Worker
2020-01-10 08:34:19 +00:00
parent 4666dc1d5c 19c2ed44ea
commit 47173f4481
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -28796,6 +28796,7 @@ package android.net {
ctor public DhcpInfo();
method public int describeContents();
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 dns2;
field public int gateway;

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