Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47173f44 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Expose DhcpInfo parcelable interface implementation methods" am: 44780ff9 am: 19c2ed44 

Change-Id: I6bf8b0646d2a9c9df8451feb51b05bf00739c4c3
parents 4666dc1d 19c2ed44

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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;

core/java/android/net/DhcpInfo.java

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