summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-12-01 14:23:13 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-01 14:23:13 -0800
commitd2ce7f387eace18b625018b21ee3ae50e9cf8c2f (patch)
treef0c38ca0c84d97d97d1c2dd664f63e3c0bb1b7f3 /src
parent6504001eae736137a24071b7235b41abf22976a4 (diff)
parent5c29cce0bac00a7a32cd92210825a789e140cf94 (diff)
downloadandroid_packages_providers_DownloadProvider-d2ce7f387eace18b625018b21ee3ae50e9cf8c2f.tar.gz
android_packages_providers_DownloadProvider-d2ce7f387eace18b625018b21ee3ae50e9cf8c2f.tar.bz2
android_packages_providers_DownloadProvider-d2ce7f387eace18b625018b21ee3ae50e9cf8c2f.zip
am 5c29cce0: am e1823c84: Don\'t filter by UID for apps with ACCESS_ALL_DOWNLOADS
* commit '5c29cce0bac00a7a32cd92210825a789e140cf94': Don't filter by UID for apps with ACCESS_ALL_DOWNLOADS
Diffstat (limited to 'src')
-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 9604c855..9336b737 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -996,7 +996,9 @@ public final class DownloadProvider extends ContentProvider {
uriMatch == PUBLIC_DOWNLOAD_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());