commit 12511f64a05733d15d1a80a884b7b4711e7dd3b1
author Jeff Brown <jeffbrown@google.com> Sat Feb 26 16:07:51 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 26 16:07:51 2011 -0800
tree c5fd4c1541920d2bacbf82ce1c127e28d6aa7e35
parent 53ab993cd0e7397af7c79b4ba36210b3fbe2ee05
parent 239f77d20adcc0e2ce67a7907b3f6ca75b13fd00

Merge "Fix a regression matching intents when action doesn't matter."

core/java/android/content/IntentFilter.java

diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java
index 61d7424..06c1ecb 100644
--- a/core/java/android/content/IntentFilter.java
+++ b/core/java/android/content/IntentFilter.java
@@ -1094,7 +1094,7 @@
      */
     public final int match(String action, String type, String scheme,
             Uri data, Set<String> categories, String logTag) {
-        if (!matchAction(action)) {
+        if (action != null && !matchAction(action)) {
             if (Config.LOGV) Log.v(
                 logTag, "No matching action " + action + " for " + this);
             return NO_MATCH_ACTION;