diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-15 23:04:36 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-15 23:04:36 +0000 |
commit | 98987d083d898431ac7864d1491d2ea4a6c8ed93 (patch) | |
tree | 872a186794289b788328c662d51e6fabc4489ba0 /src/com/android/providers/downloads | |
parent | 231f37549c48120d69e5304a633d9f9ef08cb77c (diff) | |
parent | 86608d1b8712c93dc06ae533051099231ddab46c (diff) | |
download | android_packages_providers_DownloadProvider-98987d083d898431ac7864d1491d2ea4a6c8ed93.tar.gz android_packages_providers_DownloadProvider-98987d083d898431ac7864d1491d2ea4a6c8ed93.tar.bz2 android_packages_providers_DownloadProvider-98987d083d898431ac7864d1491d2ea4a6c8ed93.zip |
Snap for 5663715 from 86608d1b8712c93dc06ae533051099231ddab46c to qt-qpr1-release
Change-Id: Ib23734e55e3c228cd55742cd41825aa6d15f51e6
Diffstat (limited to 'src/com/android/providers/downloads')
-rw-r--r-- | src/com/android/providers/downloads/DownloadStorageProvider.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/com/android/providers/downloads/DownloadStorageProvider.java b/src/com/android/providers/downloads/DownloadStorageProvider.java index 2ffe6ce8..fc7dd5ed 100644 --- a/src/com/android/providers/downloads/DownloadStorageProvider.java +++ b/src/com/android/providers/downloads/DownloadStorageProvider.java @@ -223,20 +223,12 @@ public class DownloadStorageProvider extends FileSystemProvider { // Delegate to real provider final long token = Binder.clearCallingIdentity(); try { - if (RawDocumentsHelper.isRawDocId(docId)) { + if (RawDocumentsHelper.isRawDocId(docId) || isMediaStoreDownload(docId)) { super.deleteDocument(docId); return; } - int count; - if (isMediaStoreDownload(docId)) { - count = getContext().getContentResolver().delete( - getMediaStoreUri(docId), null, null); - } else { - count = mDm.remove(Long.parseLong(docId)); - } - - if (count != 1) { + if (mDm.remove(Long.parseLong(docId)) != 1) { throw new IllegalStateException("Failed to delete " + docId); } } finally { |