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

Commit 0cbe94a3 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Make IpPrefix final. 

Couldn't resolve a merge conflict, so skipped and make the change this way.

Change-Id: Ib043f660fca2090f0d12a5a707e5e1ad28f76adb
parent 3a1d38b3

core/java/android/net/IpPrefix.java

+1 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import java.util.Arrays; 
 *

 * Objects of this class are immutable.

 */

public class IpPrefix implements Parcelable {

public final class IpPrefix implements Parcelable {

    private final byte[] address;  // network byte order

    private final int prefixLength;
@@ -139,7 +139,6 @@ public class IpPrefix implements Parcelable { 


    /**

     * Implement the Parcelable interface.

     * @hide

     */

    public int describeContents() {

        return 0;
@@ -147,7 +146,6 @@ public class IpPrefix implements Parcelable { 


    /**

     * Implement the Parcelable interface.

     * @hide

     */

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeByteArray(address);
@@ -156,7 +154,6 @@ public class IpPrefix implements Parcelable { 


    /**

     * Implement the Parcelable interface.

     * @hide

     */

    public static final Creator<IpPrefix> CREATOR =

            new Creator<IpPrefix>() {