summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2014-06-12 16:24:38 -0700
committerRobert Greenwalt <rgreenwalt@google.com>2014-06-12 16:24:38 -0700
commite595b97ff470a5e92151350e4d7b4173032fde23 (patch)
tree8c5a5075b6f2d59ee724e31afd021285a6401c56 /core/java/android/net
parent796691e302785bd8b7822653f5f041fa375fcfc3 (diff)
downloadframeworks_base-e595b97ff470a5e92151350e4d7b4173032fde23.zip
frameworks_base-e595b97ff470a5e92151350e4d7b4173032fde23.tar.gz
frameworks_base-e595b97ff470a5e92151350e4d7b4173032fde23.tar.bz2
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
Diffstat (limited to 'core/java/android/net')
-rw-r--r--core/java/android/net/LinkProperties.java3
-rw-r--r--core/java/android/net/RouteInfo.java7
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>() {