diff options
author | Todd Kennedy <toddke@google.com> | 2016-04-04 12:29:59 -0700 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2016-06-24 16:52:38 -0700 |
commit | a75537b496e9df71c74c1d045ba5569631a16298 (patch) | |
tree | f21b4b6a2189183fe8ccdd280bdc79efc049def2 /core/java/android/content | |
parent | e7cf91a198de995c7440b3b64352effd2e309906 (diff) | |
download | frameworks_base-a75537b496e9df71c74c1d045ba5569631a16298.zip frameworks_base-a75537b496e9df71c74c1d045ba5569631a16298.tar.gz frameworks_base-a75537b496e9df71c74c1d045ba5569631a16298.tar.bz2 |
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/android/content')
-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 3a17e23..ed5dfa5 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 |