Merge branch 'cupcake'

[android-x86/packages-providers-DownloadProvider.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d9873e6..6c6cad1 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -9,11 +9,11 @@
         android:description="@string/permdesc_downloadManager"
         android:protectionLevel="signatureOrSystem" />
 
-    <!-- Allows access to the Download Manager data (for UI purposes) -->
-    <permission android:name="android.permission.ACCESS_DOWNLOAD_DATA"
-        android:label="@string/permlab_downloadData"
-        android:description="@string/permdesc_downloadData"
-        android:protectionLevel="signature" />
+    <!-- Allows advanced access to the Download Manager -->
+    <permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER_ADVANCED"
+        android:label="@string/permlab_downloadManagerAdvanced"
+        android:description="@string/permdesc_downloadManagerAdvanced"
+        android:protectionLevel="signatureOrSystem" />
 
     <!-- Allows filesystem access to /cache -->
     <permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM"
@@ -21,12 +21,6 @@
         android:description="@string/permdesc_cacheFilesystem"
         android:protectionLevel="signature" />
 
-    <!-- Allow to download to /cache/update.install -->
-    <permission android:name="android.permission.DOWNLOAD_OTA_UPDATE"
-        android:label="@string/permlab_downloadOtaUpdate"
-        android:description="@string/permdesc_downloadOtaUpdate"
-        android:protectionLevel="signature" />
-
     <!-- Allows to send download completed intents -->
     <permission android:name="android.permission.SEND_DOWNLOAD_COMPLETED_INTENTS"
         android:label="@string/permlab_downloadCompletedIntent"
@@ -39,6 +33,7 @@
     <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.ACCESS_DOWNLOAD_DATA" />
     <application android:process="android.process.media"