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

Commit ab821a51 authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by Android (Google) Code Review
Browse files

Merge "Unhide DocumentsContract.isTreeUri."

parents 46660571 7db9c819

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31544,6 +31544,7 @@ package android.provider { 
    method public static java.lang.String getSearchDocumentsQuery(android.net.Uri);

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

    method public static boolean isDocumentUri(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);

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

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -33475,6 +33475,7 @@ package android.provider { 
    method public static java.lang.String getSearchDocumentsQuery(android.net.Uri);

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

    method public static boolean isDocumentUri(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);

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

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

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31557,6 +31557,7 @@ package android.provider { 
    method public static java.lang.String getSearchDocumentsQuery(android.net.Uri);

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

    method public static boolean isDocumentUri(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);

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

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

core/java/android/provider/DocumentsContract.java

+6 −1
Original line number Diff line number Diff line
@@ -835,7 +835,12 @@ public final class DocumentsContract { 
        return uri != null && ContentResolver.SCHEME_CONTENT.equals(uri.getScheme());

    }



    /** {@hide} */

    /**

     * Test if the given URI represents a {@link Document} tree.

     *

     * @see #buildTreeDocumentUri(String, String)

     * @see #getTreeDocumentId(Uri, String)

     */

    public static boolean isTreeUri(Uri uri) {

        final List<String> paths = uri.getPathSegments();

        return (paths.size() >= 2 && PATH_TREE.equals(paths.get(0)));