summaryrefslogtreecommitdiffstats
path: root/packages/ExternalStorageProvider
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-10-07 15:16:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-07 15:16:14 -0700
commit5b6372171c5ee06dc0ce00644008297e7a14bb38 (patch)
treee9757617c387a17e952b9b9b1ab3f008c61235ef /packages/ExternalStorageProvider
parentf1bab3c8162a0f9ee553c369d8e36157fa00ea07 (diff)
parent9d1383c61ca0932cb36b104a89c32db15de6a10e (diff)
downloadframeworks_base-5b6372171c5ee06dc0ce00644008297e7a14bb38.zip
frameworks_base-5b6372171c5ee06dc0ce00644008297e7a14bb38.tar.gz
frameworks_base-5b6372171c5ee06dc0ce00644008297e7a14bb38.tar.bz2
am 9d1383c6: am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev
* commit '9d1383c61ca0932cb36b104a89c32db15de6a10e': Add <intent-filter> support to <provider>.
Diffstat (limited to 'packages/ExternalStorageProvider')
-rw-r--r--packages/ExternalStorageProvider/AndroidManifest.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/ExternalStorageProvider/AndroidManifest.xml b/packages/ExternalStorageProvider/AndroidManifest.xml
index 7094efc..99a4260 100644
--- a/packages/ExternalStorageProvider/AndroidManifest.xml
+++ b/packages/ExternalStorageProvider/AndroidManifest.xml
@@ -11,9 +11,9 @@
android:grantUriPermissions="true"
android:exported="true"
android:permission="android.permission.MANAGE_DOCUMENTS">
- <meta-data
- android:name="android.content.DOCUMENT_PROVIDER"
- android:value="true" />
+ <intent-filter>
+ <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
+ </intent-filter>
</provider>
<!-- TODO: find a better place for tests to live -->
@@ -24,9 +24,9 @@
android:exported="true"
android:permission="android.permission.MANAGE_DOCUMENTS"
android:enabled="false">
- <meta-data
- android:name="android.content.DOCUMENT_PROVIDER"
- android:value="true" />
+ <intent-filter>
+ <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
+ </intent-filter>
</provider>
</application>
</manifest>