зеркало из https://github.com/mozilla/gecko-dev.git
Bug 974289 - Fixup test for FilePicker results. r=lucasr
This commit is contained in:
Родитель
252167347d
Коммит
620066670c
|
@ -93,15 +93,24 @@ class FilePickerResultHandler implements ActivityResultHandler {
|
|||
final FragmentActivity fa = (FragmentActivity) GeckoAppShell.getGeckoInterface().getActivity();
|
||||
final LoaderManager lm = fa.getSupportLoaderManager();
|
||||
// Finally, Video pickers and some file pickers may return a content provider.
|
||||
Cursor cursor = null;
|
||||
try {
|
||||
// Try a query to make sure the expected columns exist
|
||||
final ContentResolver cr = fa.getContentResolver();
|
||||
Cursor cursor = cr.query(uri, new String[] { "MediaStore.Video.Media.DATA" }, null, null, null);
|
||||
cursor.close();
|
||||
cursor = cr.query(uri, new String[] { MediaStore.Video.Media.DATA }, null, null, null);
|
||||
|
||||
lm.initLoader(intent.hashCode(), null, new VideoLoaderCallbacks(uri));
|
||||
return;
|
||||
} catch(Exception ex) { }
|
||||
int index = cursor.getColumnIndex(MediaStore.Video.Media.DATA);
|
||||
if (index >= 0) {
|
||||
lm.initLoader(intent.hashCode(), null, new VideoLoaderCallbacks(uri));
|
||||
return;
|
||||
}
|
||||
} catch(Exception ex) {
|
||||
// We'll try a different loader below
|
||||
} finally {
|
||||
if (cursor != null) {
|
||||
cursor.close();
|
||||
}
|
||||
}
|
||||
|
||||
lm.initLoader(uri.hashCode(), null, new FileLoaderCallbacks(uri));
|
||||
return;
|
||||
|
@ -125,7 +134,7 @@ class FilePickerResultHandler implements ActivityResultHandler {
|
|||
final FragmentActivity fa = (FragmentActivity) GeckoAppShell.getGeckoInterface().getActivity();
|
||||
return new CursorLoader(fa,
|
||||
mUri,
|
||||
new String[] { "MediaStore.Video.Media.DATA" },
|
||||
new String[] { MediaStore.Video.Media.DATA },
|
||||
null, // selection
|
||||
null, // selectionArgs
|
||||
null); // sortOrder
|
||||
|
|
Загрузка…
Ссылка в новой задаче