diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:44:05 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:44:05 -0800 |
commit | eaeda874c62a0ebc439894858e110160b7e2a212 (patch) | |
tree | 07b6980f45a265cd6f37541e2adea1d52129a638 /src/com/android/providers/downloads/DownloadProvider.java | |
parent | f7568be54a40c199834f79dc1d36b704c2084a0e (diff) | |
download | android_packages_providers_DownloadProvider-eaeda874c62a0ebc439894858e110160b7e2a212.tar.gz android_packages_providers_DownloadProvider-eaeda874c62a0ebc439894858e110160b7e2a212.tar.bz2 android_packages_providers_DownloadProvider-eaeda874c62a0ebc439894858e110160b7e2a212.zip |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'src/com/android/providers/downloads/DownloadProvider.java')
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index d86fdf97..f7cdd51e 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -268,21 +268,27 @@ public final class DownloadProvider extends ContentProvider { copyBoolean(Downloads.NO_INTEGRITY, values, filteredValues); copyString(Downloads.FILENAME_HINT, values, filteredValues); copyString(Downloads.MIMETYPE, values, filteredValues); - Integer i = values.getAsInteger(Downloads.DESTINATION); - if (i != null) { + Integer dest = values.getAsInteger(Downloads.DESTINATION); + if (dest != null) { if (getContext().checkCallingPermission(Downloads.PERMISSION_ACCESS_ADVANCED) != PackageManager.PERMISSION_GRANTED - && i != Downloads.DESTINATION_EXTERNAL - && i != Downloads.DESTINATION_CACHE_PARTITION_PURGEABLE) { + && dest != Downloads.DESTINATION_EXTERNAL + && dest != Downloads.DESTINATION_CACHE_PARTITION_PURGEABLE) { throw new SecurityException("unauthorized destination code"); } - filteredValues.put(Downloads.DESTINATION, i); - if (i != Downloads.DESTINATION_EXTERNAL && - values.getAsInteger(Downloads.VISIBILITY) == null) { + filteredValues.put(Downloads.DESTINATION, dest); + } + Integer vis = values.getAsInteger(Downloads.VISIBILITY); + if (vis == null) { + if (dest == Downloads.DESTINATION_EXTERNAL) { + filteredValues.put(Downloads.VISIBILITY, + Downloads.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); + } else { filteredValues.put(Downloads.VISIBILITY, Downloads.VISIBILITY_HIDDEN); } + } else { + filteredValues.put(Downloads.VISIBILITY, vis); } - copyInteger(Downloads.VISIBILITY, values, filteredValues); copyInteger(Downloads.CONTROL, values, filteredValues); filteredValues.put(Downloads.STATUS, Downloads.STATUS_PENDING); filteredValues.put(Downloads.LAST_MODIFICATION, System.currentTimeMillis()); |