Merge "To remove the old DRM support totally because we added the new Forward Lock...
Gloria Wang [Wed, 22 Jun 2011 20:47:19 +0000 (13:47 -0700)]
1  2 
AndroidManifest.xml
ui/src/com/android/providers/downloads/ui/DownloadAdapter.java

      <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 -->
 +    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
  
      <application android:process="android.process.media"
                   android:label="@string/app_label">