Merge "Removing a mimeIcon specific for album folders that are from MediaProvider." into nyc-andromeda-dev
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bfed16c..7a3a9d2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -132,14 +132,14 @@
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item</item>
</plurals>
<string name="delete_filename_confirmation_message" msgid="8338069763240613258">"\'<xliff:g id="NAME">%1$s</xliff:g>\' verwijderen?"</string>
- <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">"Map \'<xliff:g id="NAME">%1$s</xliff:g>\' en de bijbehorende inhoud verwijderen?"</string>
+ <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">"Map \'<xliff:g id="NAME">%1$s</xliff:g>\' en de bijbehorende content verwijderen?"</string>
<plurals name="delete_files_confirmation_message" formatted="false" msgid="4866664063250034142">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden verwijderen?</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand verwijderen?</item>
</plurals>
<plurals name="delete_folders_confirmation_message" formatted="false" msgid="1028946402799686388">
- <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> mappen en de bijbehorende inhoud verwijderen?</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> map en de bijbehorende inhoud verwijderen?</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> mappen en de bijbehorende content verwijderen?</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> map en de bijbehorende content verwijderen?</item>
</plurals>
<plurals name="delete_items_confirmation_message" formatted="false" msgid="7285090426511028179">
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items verwijderen?</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 466e90b..2c34546 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -46,7 +46,7 @@
<string name="button_copy" msgid="8219059853840996027">"Копирај"</string>
<string name="button_move" msgid="8596460499325291272">"Премести"</string>
<string name="button_dismiss" msgid="7235249361023803349">"Одбаци"</string>
- <string name="button_retry" msgid="4011461781916631389">"Покушај поново"</string>
+ <string name="button_retry" msgid="4011461781916631389">"Пробај поново"</string>
<string name="not_sorted" msgid="7813496644889115530">"Нису сортирани"</string>
<string name="sort_dimension_name" msgid="6325591541414177579">"Назив"</string>
<string name="sort_dimension_summary" msgid="7724534446881397860">"Резиме"</string>
diff --git a/src/com/android/documentsui/RecentsLoader.java b/src/com/android/documentsui/RecentsLoader.java
index 6ce1896..c3ccbba 100644
--- a/src/com/android/documentsui/RecentsLoader.java
+++ b/src/com/android/documentsui/RecentsLoader.java
@@ -140,7 +140,7 @@
// Collect all finished tasks
boolean allDone = true;
int totalQuerySize = 0;
- List<Cursor> cursors = new ArrayList<>();
+ List<Cursor> cursors = new ArrayList<>(mTasks.size());
for (RecentsTask task : mTasks.values()) {
if (task.isDone()) {
try {
@@ -168,6 +168,10 @@
throw new RuntimeException(e);
} catch (ExecutionException e) {
// We already logged on other side
+ } catch (Exception e) {
+ // Catch exceptions thrown when we read the cursor.
+ Log.e(TAG, "Failed to query Recents for authority: " + task.authority
+ + ". Skip this authority in Recents.", e);
}
} else {
allDone = false;
@@ -189,7 +193,6 @@
merged = new MatrixCursor(new String[0]);
}
-
final Cursor sorted = mState.sortModel.sortCursor(merged);
// Tell the UI if this is an in-progress result. When loading is complete, another update is