summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorKevin Hufnagle <khufnagle@google.com>2019-09-17 12:44:44 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-17 12:44:44 -0700
commit45815665219a368aed11651f0791945801ece4e9 (patch)
tree07714eff48eeb75f9798576d2ab29d927ceee548 /core/java
parent5ce9d3842ff32408806c3e630923b3471e5c8ebf (diff)
parent4d53ea94c7d76204e39dbce4d144839fe3d423d7 (diff)
Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev am: 1fe99017eb am: 1e8492c744 am: 85bd2c62cb
am: 4d53ea94c7 Change-Id: I734924789d8e8b6eac3270f857eadd0752904493
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/IntentFilter.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java
index 9d523633feb6..099dea29eaf7 100644
--- a/core/java/android/content/IntentFilter.java
+++ b/core/java/android/content/IntentFilter.java
@@ -60,9 +60,7 @@ import java.util.Set;
* multiple possible matching values (via {@link #addAction},
* {@link #addDataType}, {@link #addDataScheme}, {@link #addDataSchemeSpecificPart},
* {@link #addDataAuthority}, {@link #addDataPath}, and {@link #addCategory}, respectively).
- * For actions, the field
- * will not be tested if no values have been given (treating it as a wildcard);
- * if no data characteristics are specified, however, then the filter will
+ * For actions, if no data characteristics are specified, then the filter will
* only match intents that contain no data.
*
* <p>The data characteristic is