diff options
| author | Steve Howard <showard@google.com> | 2010-08-06 19:06:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-06 19:06:59 -0700 |
| commit | e5c19fcdb4ed7da8f594b49efeb11dc33f0ca9a3 (patch) | |
| tree | bd73ec1f3acdc001cd87918187be42c5772105cf /src/com/android/providers/downloads/DownloadProvider.java | |
| parent | 916a2bf069faf43d11942ac522ee9e17439df7c5 (diff) | |
| parent | 1d332ceb5756ef2e09ae97f1735aa9b529063874 (diff) | |
| download | android_packages_providers_DownloadProvider-e5c19fcdb4ed7da8f594b49efeb11dc33f0ca9a3.tar.gz android_packages_providers_DownloadProvider-e5c19fcdb4ed7da8f594b49efeb11dc33f0ca9a3.tar.bz2 android_packages_providers_DownloadProvider-e5c19fcdb4ed7da8f594b49efeb11dc33f0ca9a3.zip | |
am 1d332ceb: am da5a4183: Merge "Make all public API downloads visible." into gingerbread
Merge commit '1d332ceb5756ef2e09ae97f1735aa9b529063874'
* commit '1d332ceb5756ef2e09ae97f1735aa9b529063874':
Make all public API downloads visible.
Diffstat (limited to 'src/com/android/providers/downloads/DownloadProvider.java')
| -rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 74fd2792..4667b41c 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -499,8 +499,15 @@ public final class DownloadProvider extends ContentProvider { enforceAllowedValues(values, Downloads.Impl.COLUMN_DESTINATION, Downloads.Impl.DESTINATION_CACHE_PARTITION_PURGEABLE, Downloads.Impl.DESTINATION_FILE_URI); - enforceAllowedValues(values, Downloads.Impl.COLUMN_VISIBILITY, - null, Downloads.Impl.VISIBILITY_VISIBLE); + + if (getContext().checkCallingOrSelfPermission(Downloads.Impl.PERMISSION_NO_NOTIFICATION) + == PackageManager.PERMISSION_GRANTED) { + enforceAllowedValues(values, Downloads.Impl.COLUMN_VISIBILITY, + Downloads.Impl.VISIBILITY_HIDDEN, Downloads.Impl.VISIBILITY_VISIBLE); + } else { + enforceAllowedValues(values, Downloads.Impl.COLUMN_VISIBILITY, + Downloads.Impl.VISIBILITY_VISIBLE); + } // remove the rest of the columns that are allowed (with any value) values.remove(Downloads.Impl.COLUMN_URI); |