From 2b64a88274f0af2c19aeacc81735605e7300cf3c Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Fri, 11 Nov 2016 15:24:58 -0800 Subject: [PATCH] Javadoc and un@hide ContentResolver#refresh and ContentProvider#refresh. Test: CTS Tests part of same topic. Bug: 31647485 Change-Id: Iad7f19b6b54f72736fbb7e477f67cf541d838903 --- api/current.txt | 2 ++ api/system-current.txt | 2 ++ api/test-current.txt | 2 ++ core/java/android/content/ContentProvider.java | 1 - core/java/android/content/ContentResolver.java | 9 +-------- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/api/current.txt b/api/current.txt index 6937087b86dc2..64339b37ef525 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7904,6 +7904,7 @@ package android.content { method public android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException; method public abstract android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String); method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal); + method public boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal); method protected final void setPathPermissions(android.content.pm.PathPermission[]); method protected final void setReadPermission(java.lang.String); method protected final void setWritePermission(java.lang.String); @@ -8037,6 +8038,7 @@ package android.content { method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException; method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String); method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal); + method public final boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal); method public final void registerContentObserver(android.net.Uri, boolean, android.database.ContentObserver); method public void releasePersistableUriPermission(android.net.Uri, int); method public static void removePeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle); diff --git a/api/system-current.txt b/api/system-current.txt index de033bd00bde7..62ae3b306bdc1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8236,6 +8236,7 @@ package android.content { method public android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException; method public abstract android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String); method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal); + method public boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal); method protected final void setPathPermissions(android.content.pm.PathPermission[]); method protected final void setReadPermission(java.lang.String); method protected final void setWritePermission(java.lang.String); @@ -8369,6 +8370,7 @@ package android.content { method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException; method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String); method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal); + method public final boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal); method public final void registerContentObserver(android.net.Uri, boolean, android.database.ContentObserver); method public void releasePersistableUriPermission(android.net.Uri, int); method public static void removePeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle); diff --git a/api/test-current.txt b/api/test-current.txt index d66e9c079ff6e..5955e767da33a 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -7920,6 +7920,7 @@ package android.content { method public android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException; method public abstract android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String); method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal); + method public boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal); method protected final void setPathPermissions(android.content.pm.PathPermission[]); method protected final void setReadPermission(java.lang.String); method protected final void setWritePermission(java.lang.String); @@ -8054,6 +8055,7 @@ package android.content { method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException; method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String); method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal); + method public final boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal); method public final void registerContentObserver(android.net.Uri, boolean, android.database.ContentObserver); method public void releasePersistableUriPermission(android.net.Uri, int); method public static void removePeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle); diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 49b58536b3edb..f369409580111 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 705c091a64233..478acc2400e6d 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. - *

* This allows clients to request an explicit refresh of content identified by {@code uri}. *

* 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. *

- * 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) {