From c4920a555d91ba95f280ad445417df797ee1aecb Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Thu, 12 Jun 2014 16:24:38 -0700 Subject: [PATCH] Fix build Re-finalizing some classes. The api/current.txt was updated separately but the change that made them final got skipped. Also had same issue for some @hide's that were removed. Change-Id: I423bb7b3029ee03425a3c446bda51ab8191887c1 --- core/java/android/net/LinkProperties.java | 3 +-- 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 bb05936a16..8eefa0f55f 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 mLinkAddresses = new ArrayList(); @@ -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 8b42bcd5cb..63d6cd3d96 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 CREATOR = new Creator() {