Merge "Javadoc and un@hide ContentResolver#refresh and ContentProvider#refresh." (c67b49af) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -7908,6 +7908,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);
		@@ -8041,6 +8042,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);

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -8240,6 +8240,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);
		@@ -8373,6 +8374,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);

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -7924,6 +7924,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);
		@@ -8058,6 +8059,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);

core/java/android/content/ContentProvider.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -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) {

core/java/android/content/ContentResolver.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -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) {