diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-09 09:11:23 -0800 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2010-12-09 09:11:23 -0800 |
commit | 5ad8a55c2a74f855fd4530e98147059206b7b2b0 (patch) | |
tree | 7e148e3ff8ac25ed3ae8f048c54df9c99e2f5387 | |
parent | b2fb2046e3dcf21c8b64e2b20195259ce369c0ea (diff) | |
parent | 9a69f10556fcd7e600f862992e1e16d69b34cb48 (diff) | |
download | android_packages_providers_DownloadProvider-5ad8a55c2a74f855fd4530e98147059206b7b2b0.tar.gz android_packages_providers_DownloadProvider-5ad8a55c2a74f855fd4530e98147059206b7b2b0.tar.bz2 android_packages_providers_DownloadProvider-5ad8a55c2a74f855fd4530e98147059206b7b2b0.zip |
merge from gingerbread
Change-Id: I38873b898f431d1815ead588807a00068a7e802c
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 4 |
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()); |