diff options
| author | Gilles Debunne <debunne@google.com> | 2011-05-26 15:50:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-26 15:50:13 -0700 |
| commit | ca6c3a2bba4445f492117697cb304a014a185159 (patch) | |
| tree | 0ddc6d01993185bfb7bfa74b5078eef886999799 /core/java/android/content | |
| parent | 2bb7432d8ff98650a0d3d84b9ac13649474595f9 (diff) | |
| parent | 4ce6822bc63665ca3e9d9984766f367ce4f4d3a7 (diff) | |
| download | frameworks_base-ca6c3a2bba4445f492117697cb304a014a185159.zip frameworks_base-ca6c3a2bba4445f492117697cb304a014a185159.tar.gz frameworks_base-ca6c3a2bba4445f492117697cb304a014a185159.tar.bz2 | |
am 4ce6822b: am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
* commit '4ce6822bc63665ca3e9d9984766f367ce4f4d3a7':
ExternalStorageFormatter takes an optional StorageVolume target.
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/IntentFilter.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java index 06c1ecb..5ba5fe1 100644 --- a/core/java/android/content/IntentFilter.java +++ b/core/java/android/content/IntentFilter.java @@ -16,16 +16,6 @@ package android.content; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlSerializer; - - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Set; - import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; @@ -37,6 +27,15 @@ import android.util.Printer; import com.android.internal.util.XmlUtils; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlSerializer; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Set; + /** * Structured description of Intent values to be matched. An IntentFilter can * match against actions, categories, and data (either via its type, scheme, @@ -755,7 +754,7 @@ public class IntentFilter implements Parcelable { } /** - * Add a new Intent data oath to match against. The filter must + * Add a new Intent data path to match against. The filter must * include one or more schemes (via {@link #addDataScheme}) <em>and</em> * one or more authorities (via {@link #addDataAuthority}) for the * path to be considered. If any paths are |