diff options
| author | Steve Howard <showard@google.com> | 2010-09-23 13:02:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 13:02:21 -0700 |
| commit | 1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3 (patch) | |
| tree | 4a21d3817d0c84ed33639e1179369865cf084475 | |
| parent | 8449490a94fb5ab02be2a67d4b57c017d8abd75a (diff) | |
| parent | bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8 (diff) | |
| download | frameworks_base-1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3.zip frameworks_base-1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3.tar.gz frameworks_base-1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3.tar.bz2 | |
am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads
Merge commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8' into gingerbread-plus-aosp
* commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8':
Have DownloadManager pass file URIs for legacy external downloads
| -rw-r--r-- | core/java/android/net/DownloadManager.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/net/DownloadManager.java b/core/java/android/net/DownloadManager.java index 836223e..18e62b0 100644 --- a/core/java/android/net/DownloadManager.java +++ b/core/java/android/net/DownloadManager.java @@ -247,6 +247,7 @@ public class DownloadManager { Downloads.COLUMN_LAST_MODIFICATION, Downloads.COLUMN_DESTINATION, Downloads.Impl.COLUMN_FILE_NAME_HINT, + Downloads.Impl._DATA, }; private static final Set<String> LONG_COLUMNS = new HashSet<String>( @@ -881,6 +882,11 @@ public class DownloadManager { return getUnderlyingString(Downloads.Impl.COLUMN_FILE_NAME_HINT); } + if (destinationType == Downloads.Impl.DESTINATION_EXTERNAL) { + // return stored destination for legacy external download + return Uri.fromFile(new File(getUnderlyingString(Downloads.Impl._DATA))).toString(); + } + // return content URI for cache download long downloadId = getUnderlyingLong(Downloads.Impl._ID); return ContentUris.withAppendedId(mBaseUri, downloadId).toString(); |