summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTodd Kennedy <toddke@google.com>2016-04-11 22:06:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-11 22:06:35 +0000
commitbd770bc97b7c4745c39d16ca417bd8ddedcaefcf (patch)
treeefc014fc5ed4f66b9cc33d970251e8a4baa5a0ef /core/java
parenta677ea72b159317ebb7456f60703babacef61650 (diff)
parentcd24c4ebc0904342b5c9657c43dfa6c07c6e1eec (diff)
DO NOT MERGE Fix intent filter priorities am: eeb970a
am: cd24c4e * commit 'cd24c4ebc0904342b5c9657c43dfa6c07c6e1eec': DO NOT MERGE Fix intent filter priorities Change-Id: Idc3d639cd5494210f06f46b644f465be26eca9b1
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/IntentFilter.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java
index 3a17e23b0547..ed5dfa5393ec 100644
--- a/core/java/android/content/IntentFilter.java
+++ b/core/java/android/content/IntentFilter.java
@@ -883,6 +883,15 @@ public class IntentFilter implements Parcelable {
return true;
}
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof AuthorityEntry) {
+ final AuthorityEntry other = (AuthorityEntry)obj;
+ return match(other);
+ }
+ return false;
+ }
+
/**
* Determine whether this AuthorityEntry matches the given data Uri.
* <em>Note that this comparison is case-sensitive, unlike formal
@@ -917,7 +926,7 @@ public class IntentFilter implements Parcelable {
}
return MATCH_CATEGORY_HOST;
}
- };
+ }
/**
* Add a new Intent data "scheme specific part" to match against. The filter must