Merge "Avoid calling into MediaProvider from DownloadProvider.onCreate()." into rvc-dev am: 8577813a71 am: cb70de7eab am: 8e229daff1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/DownloadProvider/+/11814518
Change-Id: I32bcd938a81ca6006f60ca10305dbf1516bf33c4
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index 7620c6d..f61ac62 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -1249,6 +1249,7 @@
error.append(", ");
}
error.append(entry.getKey());
+ first = false;
}
throw new SecurityException(error.toString());
}
diff --git a/ui/AndroidManifest.xml b/ui/AndroidManifest.xml
index d08ec19..8eae933 100644
--- a/ui/AndroidManifest.xml
+++ b/ui/AndroidManifest.xml
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.providers.downloads.ui"
- android:sharedUserId="android.media">
- <uses-permission android:name="android.permission.SEND_DOWNLOAD_COMPLETED_INTENTS" />
- <uses-permission android:name="android.permission.ACCESS_ALL_DOWNLOADS" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.providers.downloads.ui"
+ android:sharedUserId="android.media">
+
+ <uses-permission android:name="android.permission.SEND_DOWNLOAD_COMPLETED_INTENTS"/>
+ <uses-permission android:name="android.permission.ACCESS_ALL_DOWNLOADS"/>
<application android:process="android.process.media"
- android:label="@string/app_label"
- android:icon="@mipmap/ic_launcher_download"
- android:hardwareAccelerated="true"
- android:supportsRtl="true"
- android:requiredForAllUsers="true"
- android:usesCleartextTraffic="true">
+ android:label="@string/app_label"
+ android:icon="@mipmap/ic_launcher_download"
+ android:hardwareAccelerated="true"
+ android:supportsRtl="true"
+ android:requiredForAllUsers="true"
+ android:usesCleartextTraffic="true">
- <activity
- android:name=".TrampolineActivity"
- android:theme="@android:style/Theme.Translucent.NoTitleBar"
- android:permission="android.permission.MANAGE_DOCUMENTS">
+ <activity android:name=".TrampolineActivity"
+ android:theme="@android:style/Theme.Translucent.NoTitleBar"
+ android:permission="android.permission.MANAGE_DOCUMENTS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.action.MANAGE_DOCUMENT" />
- <category android:name="android.intent.category.DEFAULT" />
- <data
- android:scheme="content"
- android:host="com.android.providers.downloads.documents"
- android:mimeType="*/*" />
+ <action android:name="android.provider.action.MANAGE_DOCUMENT"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="content"
+ android:host="com.android.providers.downloads.documents"
+ android:mimeType="*/*"/>
</intent-filter>
</activity>
</application>
