diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2019-06-14 14:39:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-14 14:39:26 -0700 |
| commit | 86608d1b8712c93dc06ae533051099231ddab46c (patch) | |
| tree | 872a186794289b788328c662d51e6fabc4489ba0 | |
| parent | 9eabbc0e48819bafd93b10db5b9eedf9dd681848 (diff) | |
| parent | c2dc83fb4c45a8383270a90ad624af061074b8a8 (diff) | |
| download | android_packages_providers_DownloadProvider-86608d1b8712c93dc06ae533051099231ddab46c.tar.gz android_packages_providers_DownloadProvider-86608d1b8712c93dc06ae533051099231ddab46c.tar.bz2 android_packages_providers_DownloadProvider-86608d1b8712c93dc06ae533051099231ddab46c.zip | |
Merge "Delegate deletion of mediaprovider downloads to FileSystemProvider." into qt-dev
am: c2dc83fb4c
Change-Id: I811574ad96e5525ac76918efdff3293881f0404b
| -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 { |