diff options
| author | Steve Howard <showard@google.com> | 2010-09-30 19:46:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 19:46:16 -0700 |
| commit | 546b6f4694a0da9d15256de304b9c49ad74b084a (patch) | |
| tree | 988af9420deb9177ab2792d57b230bc7bba5fb73 /ui | |
| parent | 9b2ffba08a51f3539ef63a56ec77371965307ee9 (diff) | |
| parent | f28405c10d132a2eeaff5140d8a83a72d9fa530b (diff) | |
| download | android_packages_providers_DownloadProvider-546b6f4694a0da9d15256de304b9c49ad74b084a.tar.gz android_packages_providers_DownloadProvider-546b6f4694a0da9d15256de304b9c49ad74b084a.tar.bz2 android_packages_providers_DownloadProvider-546b6f4694a0da9d15256de304b9c49ad74b084a.zip | |
am f28405c1: am 8df47822: Merge "Handle null local URI when deleting a download." into gingerbread
Merge commit 'f28405c10d132a2eeaff5140d8a83a72d9fa530b'
* commit 'f28405c10d132a2eeaff5140d8a83a72d9fa530b':
Handle null local URI when deleting a download.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/src/com/android/providers/downloads/ui/DownloadList.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/src/com/android/providers/downloads/ui/DownloadList.java b/ui/src/com/android/providers/downloads/ui/DownloadList.java index bb331534..f1cb91fe 100644 --- a/ui/src/com/android/providers/downloads/ui/DownloadList.java +++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java @@ -582,9 +582,11 @@ public class DownloadList extends Activity private void deleteDownload(long downloadId) { if (moveToDownload(downloadId)) { int status = mDateSortedCursor.getInt(mStatusColumnId); - if (status == DownloadManager.STATUS_SUCCESSFUL - || status == DownloadManager.STATUS_FAILED) { - String path = Uri.parse(mDateSortedCursor.getString(mLocalUriColumnId)).getPath(); + boolean isComplete = status == DownloadManager.STATUS_SUCCESSFUL + || status == DownloadManager.STATUS_FAILED; + String localUri = mDateSortedCursor.getString(mLocalUriColumnId); + if (isComplete && localUri != null) { + String path = Uri.parse(localUri).getPath(); if (path.startsWith(Environment.getExternalStorageDirectory().getPath())) { String mediaType = mDateSortedCursor.getString(mMediaTypeColumnId); deleteDownloadedFile(path, mediaType); |