Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-11 21:35:54 +00:00
committed by Android (Google) Code Review
parent 129a032374 454c526e5e
commit c16349a69d
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/app/ChooserActivity.java
View File

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

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

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