Snap for 7658382 from 0a44cc70dc295ab07e4a71bd054fedb654f86c76 to mainline-media-releaseandroid-mainline-12.0.0_r12

Change-Id: Icec579eff7010b2ac05c11fe3c1dae3343adc39e

2 files changed, 8 insertions, 1 deletions

diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 928ca3d6..c1e2d529 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -47,7 +47,7 @@
       <item quantity="one">1 ஃபைலை இறக்குகிறது</item>
     </plurals>
     <plurals name="notif_summary_waiting" formatted="false" msgid="1782251721955177526">
-      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> கோப்புகள் காத்திருக்கின்றன</item>
+      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ஃபைல்கள்  காத்திருக்கின்றன</item>
       <item quantity="one">1 கோப்பு காத்திருக்கிறது</item>
     </plurals>
     <string name="download_remaining" msgid="2313089371178695625">"<xliff:g id="DURATION">%s</xliff:g> மீதமுள்ளது"</string>
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index f7e25d59..a9e02377 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -942,6 +942,13 @@ public final class DownloadProvider extends ContentProvider {
                 }
                 return mediaStoreUri;
             }
+        } catch (IllegalArgumentException ignored) {
+            // Insert or update MediaStore failed. At this point we can't do
+            // much here. If the file belongs to MediaStore collection, it will
+            // get added to MediaStore collection during next scan, and we will
+            // obtain the uri to the file in the next MediaStore#scanFile
+            // initiated by us
+            Log.w(Constants.TAG, "Couldn't update MediaStore for " + filePath, ignored);
         } catch (RemoteException e) {
             // Should not happen
         }