summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-06-22 13:47:19 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-22 13:47:19 -0700
commitbe23a726e81b33d74708b90bab077802eced0f5f (patch)
tree1b45087b1431cd9cdf7a9284528bf2cf87b8f598 /AndroidManifest.xml
parent89eb951181e07ac00aa4d2bf7a183c6606cbdea2 (diff)
parenta1902f4d26a5c87dddf52e2e855bcd6ed9734ab2 (diff)
downloadandroid_packages_providers_DownloadProvider-be23a726e81b33d74708b90bab077802eced0f5f.zip
android_packages_providers_DownloadProvider-be23a726e81b33d74708b90bab077802eced0f5f.tar.gz
android_packages_providers_DownloadProvider-be23a726e81b33d74708b90bab077802eced0f5f.tar.bz2
Merge "To remove the old DRM support totally because we added the new Forward Lock support in Download Provider."
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b9c551e..49d0279 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -44,13 +44,11 @@
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
- <uses-permission android:name="android.permission.ACCESS_DRM" />
<uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" />
<uses-permission android:name="android.permission.SEND_DOWNLOAD_COMPLETED_INTENTS" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.INSTALL_DRM" />
<uses-permission android:name="android.permission.ACCESS_ALL_DOWNLOADS" />
<uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />
<!-- TODO: replace with READ_NETWORK_POLICY permission when it exists -->