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

Commit e770d22d authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Make DocumentsContract methods more general. 

Accepting only ContentResolver arguments was quite limiting, so use
the newly created super-interface ContentInterface, which lets
callers use a ContentResolver, and ContentProviderClient, or even a
specific ContentProvider.

This is a safe API change, since we're accepting a more-general
argument, and existing API users can continue passing ContentResolver
to these methods.

Bug: 117635768
Test: atest DocumentsUITests
Test: atest android.appsecurity.cts.DocumentsTest
Change-Id: I8f0cd1335c9b763dd81eeb237fb0517e9073b625
parent 633a13e2

api/current.txt

+14 −14
Original line number Diff line number Diff line
@@ -37397,26 +37397,26 @@ package android.provider { 
    method public static android.net.Uri buildRootsUri(java.lang.String);

    method public static android.net.Uri buildSearchDocumentsUri(java.lang.String, java.lang.String, java.lang.String);

    method public static android.net.Uri buildTreeDocumentUri(java.lang.String, java.lang.String);

    method public static android.net.Uri copyDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;

    method public static android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;

    method public static android.content.IntentSender createWebLinkIntent(android.content.ContentResolver, android.net.Uri, android.os.Bundle) throws java.io.FileNotFoundException;

    method public static boolean deleteDocument(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException;

    method public static void ejectRoot(android.content.ContentResolver, android.net.Uri);

    method public static android.provider.DocumentsContract.Path findDocumentPath(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException;

    method public static android.net.Uri copyDocument(android.content.ContentInterface, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;

    method public static android.net.Uri createDocument(android.content.ContentInterface, android.net.Uri, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;

    method public static android.content.IntentSender createWebLinkIntent(android.content.ContentInterface, android.net.Uri, android.os.Bundle) throws java.io.FileNotFoundException;

    method public static boolean deleteDocument(android.content.ContentInterface, android.net.Uri) throws java.io.FileNotFoundException;

    method public static void ejectRoot(android.content.ContentInterface, android.net.Uri);

    method public static android.provider.DocumentsContract.Path findDocumentPath(android.content.ContentInterface, android.net.Uri) throws java.io.FileNotFoundException;

    method public static java.lang.String getDocumentId(android.net.Uri);

    method public static android.os.Bundle getDocumentMetadata(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException;

    method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public static android.os.Bundle getDocumentMetadata(android.content.ContentInterface, android.net.Uri) throws java.io.FileNotFoundException;

    method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentInterface, android.net.Uri, android.graphics.Point, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public static java.lang.String getRootId(android.net.Uri);

    method public static java.lang.String getSearchDocumentsQuery(android.net.Uri);

    method public static java.lang.String getTreeDocumentId(android.net.Uri);

    method public static boolean isChildDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;

    method public static boolean isChildDocument(android.content.ContentInterface, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;

    method public static boolean isDocumentUri(android.content.Context, android.net.Uri);

    method public static boolean isRootUri(android.content.Context, android.net.Uri);

    method public static boolean isRootsUri(android.content.Context, android.net.Uri);

    method public static boolean isTreeUri(android.net.Uri);

    method public static android.net.Uri moveDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;

    method public static boolean removeDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;

    method public static android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;

    method public static android.net.Uri moveDocument(android.content.ContentInterface, android.net.Uri, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;

    method public static boolean removeDocument(android.content.ContentInterface, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;

    method public static android.net.Uri renameDocument(android.content.ContentInterface, android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;

    field public static final java.lang.String ACTION_DOCUMENT_SETTINGS = "android.provider.action.DOCUMENT_SETTINGS";

    field public static final java.lang.String EXTRA_ERROR = "error";

    field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";
@@ -53285,7 +53285,7 @@ package android.webkit { 
    method public abstract boolean getDomStorageEnabled();

    method public abstract java.lang.String getFantasyFontFamily();

    method public abstract java.lang.String getFixedFontFamily();

    method public abstract int getForceDarkMode();

    method public int getForceDarkMode();

    method public abstract boolean getJavaScriptCanOpenWindowsAutomatically();

    method public abstract boolean getJavaScriptEnabled();

    method public abstract android.webkit.WebSettings.LayoutAlgorithm getLayoutAlgorithm();
@@ -53332,7 +53332,7 @@ package android.webkit { 
    method public abstract deprecated void setEnableSmoothTransition(boolean);

    method public abstract void setFantasyFontFamily(java.lang.String);

    method public abstract void setFixedFontFamily(java.lang.String);

    method public abstract void setForceDarkMode(int);

    method public void setForceDarkMode(int);

    method public abstract deprecated void setGeolocationDatabasePath(java.lang.String);

    method public abstract void setGeolocationEnabled(boolean);

    method public abstract void setJavaScriptCanOpenWindowsAutomatically(boolean);

core/java/android/content/ContentResolver.java

+3 −3
Original line number Diff line number Diff line
@@ -3283,10 +3283,10 @@ public abstract class ContentResolver implements ContentInterface { 
    }



    /** {@hide} */

    public static Bitmap loadThumbnail(@NonNull ContentProviderClient client, @NonNull Uri uri,

    public static Bitmap loadThumbnail(@NonNull ContentInterface content, @NonNull Uri uri,

            @NonNull Size size, @Nullable CancellationSignal signal, int allocator)

            throws IOException {

        Objects.requireNonNull(client);

        Objects.requireNonNull(content);

        Objects.requireNonNull(uri);

        Objects.requireNonNull(size);
@@ -3295,7 +3295,7 @@ public abstract class ContentResolver implements ContentInterface { 
        opts.putParcelable(EXTRA_SIZE, Point.convert(size));



        return ImageDecoder.decodeBitmap(ImageDecoder.createSource(() -> {

            return client.openTypedAssetFileDescriptor(uri, "image/*", opts, signal);

            return content.openTypedAssetFile(uri, "image/*", opts, signal);

        }), (ImageDecoder decoder, ImageInfo info, Source source) -> {

            decoder.setAllocator(allocator);

core/java/android/provider/DocumentsContract.java

+124 −305

File changed.

Preview size limit exceeded, changes collapsed.