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

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

Merge "Don't mark query+cancellationSignal final."

parents 6cdd5053 0bb25299

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -33071,7 +33071,6 @@ package android.provider { 
    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 android.content.res.AssetFileDescriptor openTypedDocument(java.lang.String, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    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);

    method public abstract android.database.Cursor queryChildDocuments(java.lang.String, java.lang.String[], java.lang.String) throws java.io.FileNotFoundException;

    method public android.database.Cursor queryChildDocuments(java.lang.String, java.lang.String[], android.os.Bundle) throws java.io.FileNotFoundException;

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -35948,7 +35948,6 @@ package android.provider { 
    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 android.content.res.AssetFileDescriptor openTypedDocument(java.lang.String, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    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);

    method public abstract android.database.Cursor queryChildDocuments(java.lang.String, java.lang.String[], java.lang.String) throws java.io.FileNotFoundException;

    method public android.database.Cursor queryChildDocuments(java.lang.String, java.lang.String[], android.os.Bundle) throws java.io.FileNotFoundException;

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -33187,7 +33187,6 @@ package android.provider { 
    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 android.content.res.AssetFileDescriptor openTypedDocument(java.lang.String, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    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);

    method public abstract android.database.Cursor queryChildDocuments(java.lang.String, java.lang.String[], java.lang.String) throws java.io.FileNotFoundException;

    method public android.database.Cursor queryChildDocuments(java.lang.String, java.lang.String[], android.os.Bundle) throws java.io.FileNotFoundException;

core/java/android/provider/DocumentsProvider.java

+11 −1
Original line number Diff line number Diff line
@@ -678,8 +678,18 @@ public abstract class DocumentsProvider extends ContentProvider { 
        throw new UnsupportedOperationException("Pre-Android-O query format not supported.");

    }



    /**

     * WARNING: Sub-classes should not override this method. This method is non-final

     * solely for the purposes of backwards compatibility.

     *

     * @see #queryChildDocuments(String, String[], Bundle),

     *      {@link #queryDocument(String, String[])},

     *      {@link #queryRecentDocuments(String, String[])},

     *      {@link #queryRoots(String[])}, and

     *      {@link #querySearchDocuments(String, String, String[])}.

     */

    @Override

    public final Cursor query(Uri uri, String[] projection, String selection,

    public Cursor query(Uri uri, String[] projection, String selection,

            String[] selectionArgs, String sortOrder, CancellationSignal cancellationSignal) {

        // As of Android-O, ContentProvider#query (w/ bundle arg) is the primary

        // transport method. We override that, and don't ever delegate to this metohd.