diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2014-06-13 00:04:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-12 05:34:42 +0000 |
| commit | 65599da8612b72973f0334286d10bf5f1219da0f (patch) | |
| tree | 826304d7b0756947f114b1bbd481ccaa20282eed /core/java/android/net | |
| parent | 53fe28b7b64da4452b3c49310ac9a7aec5b44763 (diff) | |
| parent | e595b97ff470a5e92151350e4d7b4173032fde23 (diff) | |
| download | frameworks_base-65599da8612b72973f0334286d10bf5f1219da0f.zip frameworks_base-65599da8612b72973f0334286d10bf5f1219da0f.tar.gz frameworks_base-65599da8612b72973f0334286d10bf5f1219da0f.tar.bz2 | |
Merge "Fix build"
Diffstat (limited to 'core/java/android/net')
| -rw-r--r-- | core/java/android/net/LinkProperties.java | 3 | ||||
| -rw-r--r-- | core/java/android/net/RouteInfo.java | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index bb05936..8eefa0f 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java @@ -44,7 +44,7 @@ import java.util.List; * does not affect live networks. * */ -public class LinkProperties implements Parcelable { +public final class LinkProperties implements Parcelable { // The interface described by the network link. private String mIfaceName; private ArrayList<LinkAddress> mLinkAddresses = new ArrayList<LinkAddress>(); @@ -463,7 +463,6 @@ public class LinkProperties implements Parcelable { /** * Implement the Parcelable interface - * @hide */ public int describeContents() { return 0; diff --git a/core/java/android/net/RouteInfo.java b/core/java/android/net/RouteInfo.java index 8b42bcd..63d6cd3 100644 --- a/core/java/android/net/RouteInfo.java +++ b/core/java/android/net/RouteInfo.java @@ -46,7 +46,7 @@ import java.util.Objects; * destination and gateway are both specified, they must be of the same address family * (IPv4 or IPv6). */ -public class RouteInfo implements Parcelable { +public final class RouteInfo implements Parcelable { /** * The IP destination address for this route. * TODO: Make this an IpPrefix. @@ -248,7 +248,7 @@ public class RouteInfo implements Parcelable { * Retrieves the gateway or next hop {@link InetAddress} for this route. * * @return {@link InetAddress} specifying the gateway or next hop. This may be - & {@code null} for a directly-connected route." + * {@code null} for a directly-connected route." */ public InetAddress getGateway() { return mGateway; @@ -378,7 +378,6 @@ public class RouteInfo implements Parcelable { /** * Implement the Parcelable interface - * @hide */ public int describeContents() { return 0; @@ -386,7 +385,6 @@ public class RouteInfo implements Parcelable { /** * Implement the Parcelable interface - * @hide */ public void writeToParcel(Parcel dest, int flags) { if (mDestination == null) { @@ -409,7 +407,6 @@ public class RouteInfo implements Parcelable { /** * Implement the Parcelable interface. - * @hide */ public static final Creator<RouteInfo> CREATOR = new Creator<RouteInfo>() { |