diff options
| author | Kenny Root <kroot@google.com> | 2010-12-01 14:23:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-01 14:23:19 -0800 |
| commit | 4da12f07b5c1ecd7cea7f44081a744523936bd41 (patch) | |
| tree | d5cd71220a8a0f8912c397a02d12e55f8fee45a0 | |
| parent | a7f76874f5493e6f18be91c1d13e572d68f1dd20 (diff) | |
| parent | 1de6ca69cc541ccdd651071c8bd5629af4e09664 (diff) | |
| download | frameworks_base-4da12f07b5c1ecd7cea7f44081a744523936bd41.zip frameworks_base-4da12f07b5c1ecd7cea7f44081a744523936bd41.tar.gz frameworks_base-4da12f07b5c1ecd7cea7f44081a744523936bd41.tar.bz2 | |
am 1de6ca69: am 938d0972: Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
* commit '1de6ca69cc541ccdd651071c8bd5629af4e09664':
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
| -rw-r--r-- | core/java/android/provider/Downloads.java | 9 | ||||
| -rwxr-xr-x | packages/DefaultContainerService/AndroidManifest.xml | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/provider/Downloads.java b/core/java/android/provider/Downloads.java index 683e603..b2b8c5a 100644 --- a/core/java/android/provider/Downloads.java +++ b/core/java/android/provider/Downloads.java @@ -51,7 +51,14 @@ public final class Downloads { "android.permission.ACCESS_DOWNLOAD_MANAGER_ADVANCED"; /** - * The permission to directly access the download manager's cache directory + * The permission to access the all the downloads in the manager. + */ + public static final String PERMISSION_ACCESS_ALL = + "android.permission.ACCESS_ALL_DOWNLOADS"; + + /** + * The permission to directly access the download manager's cache + * directory */ public static final String PERMISSION_CACHE = "android.permission.ACCESS_CACHE_FILESYSTEM"; diff --git a/packages/DefaultContainerService/AndroidManifest.xml b/packages/DefaultContainerService/AndroidManifest.xml index 078daa7..b0597c4 100755 --- a/packages/DefaultContainerService/AndroidManifest.xml +++ b/packages/DefaultContainerService/AndroidManifest.xml @@ -1,6 +1,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.defcontainer"> <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER"/> + <uses-permission android:name="android.permission.ACCESS_ALL_DOWNLOADS"/> <uses-permission android:name="android.permission.ASEC_ACCESS"/> <uses-permission android:name="android.permission.ASEC_CREATE"/> <uses-permission android:name="android.permission.ASEC_DESTROY"/> |