summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-11-15 21:11:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-11-15 21:11:07 +0000
commitc67b49af3fdb3582d07aa533d9cf063ba9aabc2c (patch)
treed1770b321b91736d8fd999682720c4ed5dc7a06a /core/java
parent630c5879d6fdfe682a10812f27f542623353d630 (diff)
parent2b64a88274f0af2c19aeacc81735605e7300cf3c (diff)
Merge "Javadoc and un@hide ContentResolver#refresh and ContentProvider#refresh."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/ContentProvider.java1
-rw-r--r--core/java/android/content/ContentResolver.java9
2 files changed, 1 insertions, 9 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index 49b58536b3ed..f36940958011 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -1131,7 +1131,6 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
* {@link CancellationSignal#throwIfCanceled()} to check whether the client has
* canceled the refresh request.
* @return true if the provider actually tried refreshing.
- * @hide
*/
public boolean refresh(Uri uri, @Nullable Bundle args,
@Nullable CancellationSignal cancellationSignal) {
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index d7f683336f8b..54dcd0a2c81c 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -673,19 +673,13 @@ public abstract class ContentResolver {
}
/**
- * Implement this to support refresh of content identified by {@code uri}. By default, this
- * method returns false; providers who wish to implement this should return true to signal the
- * client that the provider has tried refreshing with its own implementation.
- * <p>
* This allows clients to request an explicit refresh of content identified by {@code uri}.
* <p>
* Client code should only invoke this method when there is a strong indication (such as a user
* initiated pull to refresh gesture) that the content is stale.
* <p>
- * Remember to send {@link ContentResolver#notifyChange(Uri, android.database.ContentObserver)}
- * notifications when content changes.
*
- * @param uri The Uri identifying the data to refresh.
+ * @param url The Uri identifying the data to refresh.
* @param args Additional options from the client. The definitions of these are specific to the
* content provider being called.
* @param cancellationSignal A signal to cancel the operation in progress, or {@code null} if
@@ -693,7 +687,6 @@ public abstract class ContentResolver {
* {@link CancellationSignal#throwIfCanceled()} to check whether the client has
* canceled the refresh request.
* @return true if the provider actually tried refreshing.
- * @hide
*/
public final boolean refresh(@NonNull Uri url, @Nullable Bundle args,
@Nullable CancellationSignal cancellationSignal) {