diff options
| author | Android Code Review <code-review@android.com> | 2009-02-09 09:57:58 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2009-02-09 09:57:58 -0800 |
| commit | 17e1fece639f129081d53a65d12fdeeca6322605 (patch) | |
| tree | bc97b219bab41d98e29cad77f1d9e47bebd65f7b /src | |
| parent | ada0b544e9f823aa6d685f0c8143c6ae5bab93cf (diff) | |
| parent | ce8813afb256269e9e223f72ebced92560201bbb (diff) | |
| download | android_packages_providers_DownloadProvider-17e1fece639f129081d53a65d12fdeeca6322605.tar.gz android_packages_providers_DownloadProvider-17e1fece639f129081d53a65d12fdeeca6322605.tar.bz2 android_packages_providers_DownloadProvider-17e1fece639f129081d53a65d12fdeeca6322605.zip | |
Merge
Diffstat (limited to 'src')
| -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 25d25e36..6b3124a1 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -267,21 +267,27 @@ public final class DownloadProvider extends ContentProvider { copyBoolean(Downloads.COLUMN_NO_INTEGRITY, values, filteredValues); copyString(Downloads.COLUMN_FILE_NAME_HINT, values, filteredValues); copyString(Downloads.COLUMN_MIME_TYPE, values, filteredValues); - Integer i = values.getAsInteger(Downloads.COLUMN_DESTINATION); - if (i != null) { + Integer dest = values.getAsInteger(Downloads.COLUMN_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.COLUMN_DESTINATION, i); - if (i != Downloads.DESTINATION_EXTERNAL && - values.getAsInteger(Downloads.COLUMN_VISIBILITY) == null) { + filteredValues.put(Downloads.COLUMN_DESTINATION, dest); + } + Integer vis = values.getAsInteger(Downloads.COLUMN_VISIBILITY); + if (vis == null) { + if (dest == Downloads.DESTINATION_EXTERNAL) { + filteredValues.put(Downloads.COLUMN_VISIBILITY, + Downloads.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); + } else { filteredValues.put(Downloads.COLUMN_VISIBILITY, Downloads.VISIBILITY_HIDDEN); } + } else { + filteredValues.put(Downloads.COLUMN_VISIBILITY, vis); } - copyInteger(Downloads.COLUMN_VISIBILITY, values, filteredValues); copyInteger(Downloads.COLUMN_CONTROL, values, filteredValues); filteredValues.put(Downloads.COLUMN_STATUS, Downloads.STATUS_PENDING); filteredValues.put(Downloads.COLUMN_LAST_MODIFICATION, System.currentTimeMillis()); |