summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-12-01 14:20:45 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-01 14:20:45 -0800
commit5c29cce0bac00a7a32cd92210825a789e140cf94 (patch)
tree7e148e3ff8ac25ed3ae8f048c54df9c99e2f5387
parentb2fb2046e3dcf21c8b64e2b20195259ce369c0ea (diff)
parente1823c84698006aa26a8c5dcfa5c4034858dfbe3 (diff)
downloadandroid_packages_providers_DownloadProvider-5c29cce0bac00a7a32cd92210825a789e140cf94.tar.gz
android_packages_providers_DownloadProvider-5c29cce0bac00a7a32cd92210825a789e140cf94.tar.bz2
android_packages_providers_DownloadProvider-5c29cce0bac00a7a32cd92210825a789e140cf94.zip
am e1823c84: Don\'t filter by UID for apps with ACCESS_ALL_DOWNLOADS
* commit 'e1823c84698006aa26a8c5dcfa5c4034858dfbe3': Don't filter by UID for apps with ACCESS_ALL_DOWNLOADS
-rw-r--r--src/com/android/providers/downloads/DownloadProvider.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index 6a67bc12..d97d6189 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -975,7 +975,9 @@ public final class DownloadProvider extends ContentProvider {
if (uriMatch == MY_DOWNLOADS_ID || uriMatch == ALL_DOWNLOADS_ID) {
selection.appendClause(Downloads.Impl._ID + " = ?", getDownloadIdFromUri(uri));
}
- if (uriMatch == MY_DOWNLOADS || uriMatch == MY_DOWNLOADS_ID) {
+ if ((uriMatch == MY_DOWNLOADS || uriMatch == MY_DOWNLOADS_ID)
+ && getContext().checkCallingPermission(Downloads.Impl.PERMISSION_ACCESS_ALL)
+ != PackageManager.PERMISSION_GRANTED) {
selection.appendClause(
Constants.UID + "= ? OR " + Downloads.Impl.COLUMN_OTHER_UID + "= ?",
Binder.getCallingUid(), Binder.getCallingPid());