commit 51fcedb0e9afe81b94965d4168f8cd388d33d56c
author Xin Li <delphij@google.com> Sun Sep 08 13:06:58 2019 -0700
committer Xin Li <delphij@google.com> Sun Sep 08 13:06:58 2019 -0700
tree cdab12276b43c1400e604079f05e2240fdc4b72c
parent a05bab68156c6c8221d0afd3cdd668de87bb6ca8
parent 0ab0cf4eb980f6d1d7125304582f9c3da4147cf2

Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

Bug: 135460123
Change-Id: Id1e22149741ef9fb72b0bb81852c7b9bf3ae0583
Merged-In: I8a200386bb14368e18a2a28c74e9c88cc91e0286

src/com/android/providers/downloads/DownloadProvider.java

diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index db98c50..f442712 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -888,6 +888,8 @@
                             mediaStoreUri.toString());
                     filteredValues.put(COLUMN_MEDIA_SCANNED, MEDIA_SCANNED);
                 }
+                MediaStore.scanFile(getContext(),
+                        new File(filteredValues.getAsString(Downloads.Impl._DATA)));
             } finally {
                 restoreCallingIdentity(token);
             }
@@ -1569,6 +1571,9 @@
                                 qb.update(db, updateValues, Downloads.Impl._ID + "=?",
                                         new String[] { Long.toString(info.mId) });
                             }
+                            if (Downloads.Impl.isStatusSuccess(info.mStatus)) {
+                                MediaStore.scanFile(getContext(), new File(info.mFileName));
+                            }
                         }
                         if (updateSchedule) {
                             Helpers.scheduleJob(context, info);