Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c6db23f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make getCache and putCache in ContentResolver @SystemApi"

parents e3fdf4fa 5922ce24

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -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);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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 {

































core/java/android/content/ContentResolver.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -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,