summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2019-01-07 10:57:31 -0800
committerSudheer Shanka <sudheersai@google.com>2019-01-07 19:16:06 +0000
commitc93b9b181562bac87ba3082b0a11da3b1e7ac02d (patch)
tree31abcf2d9918a2ca97dd3e3556a1ff5bb7a90f3d /src
parent1a76686c2f9771635b6ef57d930d875d20239531 (diff)
downloadandroid_packages_providers_DownloadProvider-c93b9b181562bac87ba3082b0a11da3b1e7ac02d.tar.gz
android_packages_providers_DownloadProvider-c93b9b181562bac87ba3082b0a11da3b1e7ac02d.tar.bz2
android_packages_providers_DownloadProvider-c93b9b181562bac87ba3082b0a11da3b1e7ac02d.zip
Fix NPE in DownloadProvider.
Bug: 122434250 Test: manual Exempt-From-Owner-Approval: minor fix to resolve a chase list bug Change-Id: I7a4a64ae0fa42eb0571d78a34166ac96457ce43a
Diffstat (limited to 'src')
-rw-r--r--src/com/android/providers/downloads/DownloadProvider.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index 2523f88a..8dc14506 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -1361,8 +1361,8 @@ public final class DownloadProvider extends ContentProvider {
.DESTINATION_NON_DOWNLOADMANAGER_DOWNLOAD) {
final Uri mediaStoreUri = updateMediaProvider(client,
info.mMediaStoreUri, convertToMediaProviderValues(info));
- if (!TextUtils.equals(
- info.mMediaStoreUri, mediaStoreUri.toString())) {
+ if (!TextUtils.equals(info.mMediaStoreUri,
+ mediaStoreUri == null ? null : mediaStoreUri.toString())) {
final ContentValues updateValues = new ContentValues();
if (mediaStoreUri == null) {
updateValues.putNull(Downloads.Impl.COLUMN_MEDIASTORE_URI);