diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/ContentResolver.java | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 2b1036d6da36..16bc8c8cf804 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9517,7 +9517,6 @@ package android.content { method public static void cancelSync(android.content.SyncRequest); method @Nullable public final android.net.Uri canonicalize(@NonNull android.net.Uri); method public final int delete(@RequiresPermission.Write @NonNull android.net.Uri, @Nullable String, @Nullable String[]); - method public android.os.Bundle getCache(android.net.Uri); method @Deprecated public static android.content.SyncInfo getCurrentSync(); method public static java.util.List<android.content.SyncInfo> getCurrentSyncs(); method public static int getIsSyncable(android.accounts.Account, String); @@ -9548,7 +9547,6 @@ package android.content { method @Nullable public final android.content.res.AssetFileDescriptor openTypedAssetFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException; method @Nullable public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.Bundle) throws java.io.FileNotFoundException; method @Nullable public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException; - method public void putCache(android.net.Uri, android.os.Bundle); method @Nullable public final android.database.Cursor query(@RequiresPermission.Read @NonNull android.net.Uri, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String); method @Nullable public final android.database.Cursor query(@RequiresPermission.Read @NonNull android.net.Uri, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String, @Nullable android.os.CancellationSignal); method @Nullable public final android.database.Cursor query(@RequiresPermission.Read @NonNull android.net.Uri, @Nullable String[], @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal); diff --git a/api/system-current.txt b/api/system-current.txt index bca77b4ea397..48a450a441a9 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1283,7 +1283,9 @@ package android.content { } public abstract class ContentResolver implements android.content.ContentInterface { + method public android.os.Bundle getCache(android.net.Uri); method public android.graphics.drawable.Drawable getTypeDrawable(String); + method public void putCache(android.net.Uri, android.os.Bundle); } public abstract class Context { diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index f1bfe8671eec..7672ccfcd995 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -2998,7 +2998,9 @@ public abstract class ContentResolver implements ContentInterface { * * @param key the key to add * @param value the value to add + * {@hide} */ + @SystemApi public void putCache(Uri key, Bundle value) { try { getContentService().putCache(mContext.getPackageName(), key, value, @@ -3014,7 +3016,9 @@ public abstract class ContentResolver implements ContentInterface { * @param key the key to get the value * @return the matched value. If the key doesn't exist, will return null. * @see #putCache(Uri, Bundle) + * {@hide} */ + @SystemApi public Bundle getCache(Uri key) { try { final Bundle bundle = getContentService().getCache(mContext.getPackageName(), key, |