Merge "Unihiding REFRESH_SUPPORTED and ContentProviderClient#refresh." (9d2b2dbc) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -8042,6 +8042,7 @@ package android.content {
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) throws android.os.RemoteException;
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal) throws android.os.RemoteException;
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal) throws android.os.RemoteException;
		method public boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal) throws android.os.RemoteException;
		method public deprecated boolean release();
		method public final android.net.Uri uncanonicalize(android.net.Uri) throws android.os.RemoteException;
		method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) throws android.os.RemoteException;
		@@ -8164,6 +8165,7 @@ package android.content {
		field public static final java.lang.String ANY_CURSOR_ITEM_TYPE = "vnd.android.cursor.item/*";
		field public static final java.lang.String CURSOR_DIR_BASE_TYPE = "vnd.android.cursor.dir";
		field public static final java.lang.String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item";
		field public static final java.lang.String EXTRA_REFRESH_SUPPORTED = "android.content.extra.REFRESH_SUPPORTED";
		field public static final java.lang.String EXTRA_SIZE = "android.content.extra.SIZE";
		field public static final int NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS = 2; // 0x2
		field public static final int NOTIFY_SYNC_TO_NETWORK = 1; // 0x1

api/system-current.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -8384,6 +8384,7 @@ package android.content {
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) throws android.os.RemoteException;
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal) throws android.os.RemoteException;
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal) throws android.os.RemoteException;
		method public boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal) throws android.os.RemoteException;
		method public deprecated boolean release();
		method public final android.net.Uri uncanonicalize(android.net.Uri) throws android.os.RemoteException;
		method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) throws android.os.RemoteException;
		@@ -8506,6 +8507,7 @@ package android.content {
		field public static final java.lang.String ANY_CURSOR_ITEM_TYPE = "vnd.android.cursor.item/*";
		field public static final java.lang.String CURSOR_DIR_BASE_TYPE = "vnd.android.cursor.dir";
		field public static final java.lang.String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item";
		field public static final java.lang.String EXTRA_REFRESH_SUPPORTED = "android.content.extra.REFRESH_SUPPORTED";
		field public static final java.lang.String EXTRA_SIZE = "android.content.extra.SIZE";
		field public static final int NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS = 2; // 0x2
		field public static final int NOTIFY_SYNC_TO_NETWORK = 1; // 0x1
		@@ -26139,8 +26141,8 @@ package android.net {
		}

		public final class RecommendationResult implements android.os.Parcelable {
		method public static android.net.RecommendationResult createDoNotConnectRecommendation();
		method public static android.net.RecommendationResult createConnectRecommendation(android.net.wifi.WifiConfiguration);
		method public static android.net.RecommendationResult createDoNotConnectRecommendation();
		method public int describeContents();
		method public android.net.wifi.WifiConfiguration getWifiConfiguration();
		method public boolean hasRecommendation();

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -8064,6 +8064,7 @@ package android.content {
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) throws android.os.RemoteException;
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal) throws android.os.RemoteException;
		method public android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal) throws android.os.RemoteException;
		method public boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal) throws android.os.RemoteException;
		method public deprecated boolean release();
		method public final android.net.Uri uncanonicalize(android.net.Uri) throws android.os.RemoteException;
		method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) throws android.os.RemoteException;
		@@ -8187,6 +8188,7 @@ package android.content {
		field public static final java.lang.String ANY_CURSOR_ITEM_TYPE = "vnd.android.cursor.item/*";
		field public static final java.lang.String CURSOR_DIR_BASE_TYPE = "vnd.android.cursor.dir";
		field public static final java.lang.String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item";
		field public static final java.lang.String EXTRA_REFRESH_SUPPORTED = "android.content.extra.REFRESH_SUPPORTED";
		field public static final java.lang.String EXTRA_SIZE = "android.content.extra.SIZE";
		field public static final int NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS = 2; // 0x2
		field public static final int NOTIFY_SYNC_TO_NETWORK = 1; // 0x1

core/java/android/content/ContentProviderClient.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -237,7 +237,7 @@ public class ContentProviderClient implements AutoCloseable {
		}
		}

		/** @hide */
		/** See {@link ContentProvider#refresh} */
		public boolean refresh(Uri url, @Nullable Bundle args,
		@Nullable CancellationSignal cancellationSignal) throws RemoteException {
		Preconditions.checkNotNull(url, "url");

core/java/android/content/ContentResolver.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -198,7 +198,6 @@ public abstract class ContentResolver {
		* or not. If a provider supports refresh, it should include this key in its
		* returned Cursor as part of its query call.
		*
		* @hide
		*/
		public static final String EXTRA_REFRESH_SUPPORTED = "android.content.extra.REFRESH_SUPPORTED";