diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2019-06-14 21:21:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-14 21:21:27 +0000 |
| commit | c2dc83fb4c45a8383270a90ad624af061074b8a8 (patch) | |
| tree | 872a186794289b788328c662d51e6fabc4489ba0 | |
| parent | 1a7a0ecbc44360e6487a01c43a95788f0aad097a (diff) | |
| parent | bcafd4ab8ce6e2327275069d4dc3a83a3891c813 (diff) | |
| download | android_packages_providers_DownloadProvider-c2dc83fb4c45a8383270a90ad624af061074b8a8.tar.gz android_packages_providers_DownloadProvider-c2dc83fb4c45a8383270a90ad624af061074b8a8.tar.bz2 android_packages_providers_DownloadProvider-c2dc83fb4c45a8383270a90ad624af061074b8a8.zip | |
Merge "Delegate deletion of mediaprovider downloads to FileSystemProvider." into qt-dev
| -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 { |