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/LinkProperties.java | |
| 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/LinkProperties.java')
| -rw-r--r-- | core/java/android/net/LinkProperties.java | 3 |
1 files changed, 1 insertions, 2 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; |