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

Commit fd3415c4 authored by Ivan Chiang's avatar Ivan Chiang
Browse files

Expose @SystemApi and @Public for unbundling DocumentsUI 

* Expose getCache and putCache to @Public. Filed a bug
  b/117636111 to implement the maximum bounds
* Expose getTypeDrawable to @SystemApi

Change-Id: I81ab2e2198d2da1a2fa1c327ed7f9f66cb999755
Fix: 117636111
Test: make
parent dbd8c1b9

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -9401,6 +9401,7 @@ package android.content { 
    method public static void cancelSync(android.content.SyncRequest);

    method public final android.net.Uri canonicalize(android.net.Uri);

    method public final int delete(android.net.Uri, java.lang.String, java.lang.String[]);

    method public android.os.Bundle getCache(android.net.Uri);

    method public static deprecated android.content.SyncInfo getCurrentSync();

    method public static java.util.List<android.content.SyncInfo> getCurrentSyncs();

    method public static int getIsSyncable(android.accounts.Account, java.lang.String);
@@ -9431,6 +9432,7 @@ package android.content { 
    method public final android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException;

    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 void putCache(android.net.Uri, android.os.Bundle);

    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 android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal);

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -1040,6 +1040,10 @@ package android.content { 
    method public void setDetectNotResponding(long);

  }



  public abstract class ContentResolver {

    method public android.graphics.drawable.Drawable getTypeDrawable(java.lang.String);

  }



  public abstract class Context {

    method public boolean bindServiceAsUser(android.content.Intent, android.content.ServiceConnection, int, android.os.UserHandle);

    method public abstract android.content.Context createCredentialProtectedStorageContext();

core/java/android/content/ContentResolver.java

+22 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.annotation.UserIdInt;
@@ -2978,7 +2979,12 @@ public abstract class ContentResolver implements ContentInterface { 
        }

    }



    /** {@hide} */

    /**

     * Put the cache with the key.

     *

     * @param key the key to add

     * @param value the value to add

     */

    public void putCache(Uri key, Bundle value) {

        try {

            getContentService().putCache(mContext.getPackageName(), key, value,
@@ -2988,7 +2994,13 @@ public abstract class ContentResolver implements ContentInterface { 
        }

    }



    /** {@hide} */

    /**

     * Get the cache with the key.

     *

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

     */

    public Bundle getCache(Uri key) {

        try {

            final Bundle bundle = getContentService().getCache(mContext.getPackageName(), key,
@@ -3176,7 +3188,14 @@ public abstract class ContentResolver implements ContentInterface { 
        return mContext.getUserId();

    }



    /** @hide */

    /**

     * Get the system drawable of the mime type.

     *

     * @param mimeType the requested mime type

     * @return the matched drawable

     * @hide

     */

    @SystemApi

    public Drawable getTypeDrawable(String mimeType) {

        return MimeIconUtils.loadMimeIcon(mContext, mimeType);

    }