diff options
| author | Bill Yi <byi@google.com> | 2014-04-29 16:07:29 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2014-04-29 16:07:29 -0700 |
| commit | 293513a59d36cd96a3e474dde5981380d372d8c9 (patch) | |
| tree | 4268c9994be194a7f4fccdecd089af58516d0953 /core/java/android/content/ContentProvider.java | |
| parent | 1866e5dc8bb04b58a67e54f66cb4ec22e878667d (diff) | |
| parent | 0b62467b142b61ee1e449ba958ba37dfd961ef56 (diff) | |
| download | frameworks_base-293513a59d36cd96a3e474dde5981380d372d8c9.zip frameworks_base-293513a59d36cd96a3e474dde5981380d372d8c9.tar.gz frameworks_base-293513a59d36cd96a3e474dde5981380d372d8c9.tar.bz2 | |
Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD
Diffstat (limited to 'core/java/android/content/ContentProvider.java')
| -rw-r--r-- | core/java/android/content/ContentProvider.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 44831fc..02c850b 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -1328,7 +1328,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { * * @param uri The data in the content provider being queried. * @param mimeTypeFilter The type of data the client desires. May be - * a pattern, such as *\/* to retrieve all possible data types. + * a pattern, such as */* to retrieve all possible data types. * @return Returns {@code null} if there are no possible data streams for the * given mimeTypeFilter. Otherwise returns an array of all available * concrete MIME types. @@ -1366,7 +1366,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { * * @param uri The data in the content provider being queried. * @param mimeTypeFilter The type of data the client desires. May be - * a pattern, such as *\/*, if the caller does not have specific type + * a pattern, such as */*, if the caller does not have specific type * requirements; in this case the content provider will pick its best * type matching the pattern. * @param opts Additional options from the client. The definitions of @@ -1427,7 +1427,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { * * @param uri The data in the content provider being queried. * @param mimeTypeFilter The type of data the client desires. May be - * a pattern, such as *\/*, if the caller does not have specific type + * a pattern, such as */*, if the caller does not have specific type * requirements; in this case the content provider will pick its best * type matching the pattern. * @param opts Additional options from the client. The definitions of |