summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-09-21 15:07:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-21 15:07:27 -0700
commitc20ae618eb6e50c0e93d6322ae67659cc8177fb3 (patch)
tree9b18c8bf263d93e6108f876165608df7a90d8fa9
parentb157649a5620aba3ad65750d1044100b62c65d9c (diff)
parentca3d52cc2aa06ab889f2680f1cc28f540efc1cf1 (diff)
downloadandroid_packages_providers_DownloadProvider-c20ae618eb6e50c0e93d6322ae67659cc8177fb3.tar.gz
android_packages_providers_DownloadProvider-c20ae618eb6e50c0e93d6322ae67659cc8177fb3.tar.bz2
android_packages_providers_DownloadProvider-c20ae618eb6e50c0e93d6322ae67659cc8177fb3.zip
am ca3d52cc: am ece96c74: Expose permission to download without notification.
Merge commit 'ca3d52cc2aa06ab889f2680f1cc28f540efc1cf1' * commit 'ca3d52cc2aa06ab889f2680f1cc28f540efc1cf1': Expose permission to download without notification.
-rw-r--r--AndroidManifest.xml3
-rw-r--r--res/values/strings.xml4
2 files changed, 4 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f7001ff2..fa519721 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,9 +29,10 @@
<!-- Allows to queue downloads without a notification shown while the download runs. -->
<permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION"
+ android:permissionGroup="android.permission-group.NETWORK"
android:label="@string/permlab_downloadWithoutNotification"
android:description="@string/permdesc_downloadWithoutNotification"
- android:protectionLevel="signatureOrSystem"/>
+ android:protectionLevel="normal"/>
<!-- Allows an app to access all downloads in the system via the /all_downloads/ URIs. The
protection level could be relaxed in the future to support third-party download
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 543c95c7..46bf82a9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -88,8 +88,8 @@
<!-- The label for the permission to download files through the download
manager without any notification being shown to the user [CHAR LIMIT=50] -->
- <string name="permlab_downloadWithoutNotification">Use download manager
- without notification</string>
+ <string name="permlab_downloadWithoutNotification">download files without
+ notification</string>
<!-- The full sentence description for the permission to download files
through the download manager without any notification being shown to the