diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2014-06-12 12:57:19 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2014-06-12 12:57:19 -0700 |
| commit | 0cbe94a349616442672fad3751ac81f4f7f394f3 (patch) | |
| tree | 2b25adcbaadbb28b16abf802e05b7ebfd201ebd4 /core/java/android/net | |
| parent | 3a1d38b33112534709337c3477d52404747f5172 (diff) | |
| download | frameworks_base-0cbe94a349616442672fad3751ac81f4f7f394f3.zip frameworks_base-0cbe94a349616442672fad3751ac81f4f7f394f3.tar.gz frameworks_base-0cbe94a349616442672fad3751ac81f4f7f394f3.tar.bz2 | |
Make IpPrefix final.
Couldn't resolve a merge conflict, so skipped and make the change this way.
Change-Id: Ib043f660fca2090f0d12a5a707e5e1ad28f76adb
Diffstat (limited to 'core/java/android/net')
| -rw-r--r-- | core/java/android/net/IpPrefix.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/net/IpPrefix.java b/core/java/android/net/IpPrefix.java index dfe0384..a14d13f 100644 --- a/core/java/android/net/IpPrefix.java +++ b/core/java/android/net/IpPrefix.java @@ -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>() { |