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

Commit 454c526e authored by Hai Zhang's avatar Hai Zhang
Browse files

Revert "Query only necessary columns in ChooserActivity.extractF..." 

Revert submission 16791148-chooseractivity-queryresolver

Reason for revert: b/218994001
Reverted Changes:
I91bbd3971:Query only necessary columns in ChooserActivity.ex...
I2ab9c6f03:Query only necessary columns in ChooserActivity.ex...

Fixes: 16850551
Change-Id: Idbc6270bb0dc1f2402c44d111bdcebe8a25f28c2
parent 52555321

core/java/com/android/internal/app/ChooserActivity.java

+3 −9
Original line number Diff line number Diff line
@@ -217,12 +217,6 @@ public class ChooserActivity extends ResolverActivity implements 
    private static final int APP_PREDICTION_SHARE_TARGET_QUERY_PACKAGE_LIMIT = 20;

    public static final String APP_PREDICTION_INTENT_FILTER_KEY = "intent_filter";



    private static final String[] QUERY_FILE_INFO_PROJECTION = {

        OpenableColumns.DISPLAY_NAME,

        Downloads.Impl.COLUMN_TITLE,

        DocumentsContract.Document.COLUMN_FLAGS

    };



    private static final String PLURALS_COUNT = "count";

    private static final String PLURALS_FILE_NAME = "file_name";
@@ -1480,15 +1474,15 @@ public class ChooserActivity extends ResolverActivity implements 
     * and to avoid mocking Android core classes.

     */

    @VisibleForTesting

    public Cursor queryResolver(ContentResolver resolver, String[] projection, Uri uri) {

        return resolver.query(uri, projection, null, null, null);

    public Cursor queryResolver(ContentResolver resolver, Uri uri) {

        return resolver.query(uri, null, null, null, null);

    }



    private FileInfo extractFileInfo(Uri uri, ContentResolver resolver) {

        String fileName = null;

        boolean hasThumbnail = false;



        try (Cursor cursor = queryResolver(resolver, QUERY_FILE_INFO_PROJECTION, uri)) {

        try (Cursor cursor = queryResolver(resolver, uri)) {

            if (cursor != null && cursor.getCount() > 0) {

                int nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);

                int titleIndex = cursor.getColumnIndex(Downloads.Impl.COLUMN_TITLE);

core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW 
    }



    @Override

    public Cursor queryResolver(ContentResolver resolver, String[] projection, Uri uri) {

    public Cursor queryResolver(ContentResolver resolver, Uri uri) {

        if (sOverrides.resolverCursor != null) {

            return sOverrides.resolverCursor;

        }
@@ -201,7 +201,7 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW 
            throw new SecurityException("Test exception handling");

        }



        return super.queryResolver(resolver, projection, uri);

        return super.queryResolver(resolver, uri);

    }



    @Override