Merge 'lineage-17.1' into q
Change-Id: I84e8291229068d9c5ca5358a1e23211d3cb47cd9
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..3c14ebd
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=review.blissroms.com
+port=29418
+project=platform_packages_providers_DownloadProvider.git
+defaultbranch=q
diff --git a/res/values/cm_plurals.xml b/res/values/bliss_plurals.xml
similarity index 96%
rename from res/values/cm_plurals.xml
rename to res/values/bliss_plurals.xml
index b201ff5..48e9f17 100644
--- a/res/values/cm_plurals.xml
+++ b/res/values/bliss_plurals.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (C) 2014 The CyanogenMod Project
+ Copyright (C) 2019 The BlissRoms Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/res/values/cm_strings.xml b/res/values/bliss_strings.xml
similarity index 96%
rename from res/values/cm_strings.xml
rename to res/values/bliss_strings.xml
index 38964af..b2f9b98 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/bliss_strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (C) 2013-2016 The CyanogenMod Project
+ Copyright (C) 2019 The BlissRoms Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
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);