diff options
| author | Todd Kennedy <toddke@google.com> | 2016-04-04 12:29:59 -0700 |
|---|---|---|
| committer | Todd Kennedy <toddke@google.com> | 2016-04-05 13:56:59 -0700 |
| commit | eeb970ada10d37495ad7a8a4b14ad0506b640eea (patch) | |
| tree | 6096f51520b2a6f0ad9928aca1437e1002388e2e /core/java | |
| parent | 1450b69182fd9b360d9dd4ec54d431560eb775e6 (diff) | |
DO NOT MERGE Fix intent filter priorities
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.
Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/IntentFilter.java | 11 |
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 |
