diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:09:55 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:37:43 -0700 |
| commit | cacdaa4aeedc6b0817eba92a83b8e5edfe27f637 (patch) | |
| tree | f12313a55eeaa75f4faff3e1d134dc349420f094 /core/java/android/content | |
| parent | 1ab48a3666118e40cf56142c886a7217b92d0d4a (diff) | |
| parent | 4e4743a354e26467318b437892a9980eb9b8328a (diff) | |
| download | frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.zip frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.tar.gz frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.tar.bz2 | |
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z)
Change-Id: Ib003ccb606e0d77209291b757ea36399d3b65814
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 |