summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2013-04-03 05:28:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-03 05:28:52 +0000
commit6c2e8fb4d530c5fb1352e8667449591b39d89c5a (patch)
tree3dcf917f686d642d84c3d24f314efbf8368759f3 /core/java/android
parenta4ca8ea0ad14c509d1ced46482e83c1b8a518982 (diff)
parent213f98b6fe81c73f0d182fb5af312d4ce4a08041 (diff)
downloadframeworks_base-6c2e8fb4d530c5fb1352e8667449591b39d89c5a.zip
frameworks_base-6c2e8fb4d530c5fb1352e8667449591b39d89c5a.tar.gz
frameworks_base-6c2e8fb4d530c5fb1352e8667449591b39d89c5a.tar.bz2
Merge "Fix LinkProperties's equals() method." into jb-mr2-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/LinkProperties.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index 52b238f..75f8b59 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -378,7 +378,7 @@ public class LinkProperties implements Parcelable {
* @return {@code true} if both are identical, {@code false} otherwise.
*/
public boolean isIdenticalStackedLinks(LinkProperties target) {
- if (!mStackedLinks.keys().equals(target.mStackedLinks.keys())) {
+ if (!mStackedLinks.keySet().equals(target.mStackedLinks.keySet())) {
return false;
}
for (LinkProperties stacked : mStackedLinks.values()) {