Merge tag 'android-security-10.0.0_r54' into int/10/fp2
Android Security 10.0.0 Release 54 (7250004)
* tag 'android-security-10.0.0_r54':
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
Trigger mediascan after a download is completed.
Don't canonicalize app paths in system.
Fix NPE in DownloadProvider.
Revert SQLiteQueryBuilder for now.
Change-Id: I738814e5170a1254760166fd836bbccb49d7519c
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index d61ed84..1aeeef0 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -946,6 +946,8 @@
mediaStoreUri.toString());
filteredValues.put(COLUMN_MEDIA_SCANNED, MEDIA_SCANNED);
}
+ MediaStore.scanFile(getContext(),
+ new File(filteredValues.getAsString(Downloads.Impl._DATA)));
} finally {
restoreCallingIdentity(token);
}
@@ -1590,6 +1592,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);