diff options
| author | Xin Li <delphij@google.com> | 2019-05-09 22:05:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-09 22:05:45 +0000 |
| commit | 5bc12066ca932ad7a69bc992bedb2632d05abd3d (patch) | |
| tree | 612c21febaabbf6c90a8e85ca1ad3fd4fd2ff385 /core/java/android/content/ContentProvider.java | |
| parent | f84cf464e97cc2060c30a0e687e4fe237bbc742f (diff) | |
| parent | 6d7d3f2042fb4dcc20afe88ed4bb3e57364b4147 (diff) | |
Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
Diffstat (limited to 'core/java/android/content/ContentProvider.java')
| -rw-r--r-- | core/java/android/content/ContentProvider.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 2997e984add4..f1b8d1e46449 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -1073,12 +1073,12 @@ public abstract class ContentProvider implements ComponentCallbacks2 { * Implement this to handle query requests where the arguments are packed into a {@link Bundle}. * Arguments may include traditional SQL style query arguments. When present these * should be handled according to the contract established in - * {@link #query(Uri, String[], String, String[], String, CancellationSignal). + * {@link #query(Uri, String[], String, String[], String, CancellationSignal)}. * * <p>Traditional SQL arguments can be found in the bundle using the following keys: - * <li>{@link ContentResolver#QUERY_ARG_SQL_SELECTION} - * <li>{@link ContentResolver#QUERY_ARG_SQL_SELECTION_ARGS} - * <li>{@link ContentResolver#QUERY_ARG_SQL_SORT_ORDER} + * <li>{@link android.content.ContentResolver#QUERY_ARG_SQL_SELECTION} + * <li>{@link android.content.ContentResolver#QUERY_ARG_SQL_SELECTION_ARGS} + * <li>{@link android.content.ContentResolver#QUERY_ARG_SQL_SORT_ORDER} * * <p>This method can be called from multiple threads, as described in * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes @@ -1135,8 +1135,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 { return cursor;</pre> * <p> - * @see #query(Uri, String[], String, String[], String, CancellationSignal) for - * implementation details. + * See {@link #query(Uri, String[], String, String[], String, CancellationSignal)} + * for implementation details. * * @param uri The URI to query. This will be the full URI sent by the client. * @param projection The list of columns to put into the cursor. |