diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-15 23:04:55 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-15 23:04:55 +0000 |
| commit | 4d2bef219c0ad100cf1bba947d55ef73736a801a (patch) | |
| tree | 872a186794289b788328c662d51e6fabc4489ba0 | |
| parent | 25b9b22d8467c5a951d762eaff348396fb1d6921 (diff) | |
| parent | c2dc83fb4c45a8383270a90ad624af061074b8a8 (diff) | |
| download | android_packages_providers_DownloadProvider-4d2bef219c0ad100cf1bba947d55ef73736a801a.tar.gz android_packages_providers_DownloadProvider-4d2bef219c0ad100cf1bba947d55ef73736a801a.tar.bz2 android_packages_providers_DownloadProvider-4d2bef219c0ad100cf1bba947d55ef73736a801a.zip | |
Snap for 5663820 from c2dc83fb4c45a8383270a90ad624af061074b8a8 to qt-release
Change-Id: Ida3ca426c782c5f4d7ee329bd9e1f92bcb2a79d6
| -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 { |