summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-05-18 13:43:30 -0700
committerMartijn Coenen <maco@google.com>2012-05-25 11:18:03 -0700
commit03f25a2055e51bcc5e8870642763b502956b6830 (patch)
treeab8b3623e49aa60802f237334ab674f03b4b0c30 /AndroidManifest.xml
parentacc04ecbd174b07d580248aaf6640c3d2b42ca49 (diff)
downloadandroid_packages_apps_Bluetooth-03f25a2055e51bcc5e8870642763b502956b6830.tar.gz
android_packages_apps_Bluetooth-03f25a2055e51bcc5e8870642763b502956b6830.tar.bz2
android_packages_apps_Bluetooth-03f25a2055e51bcc5e8870642763b502956b6830.zip
Bluetooth OPP: Allow sending all mime-types for handover.
This change allows sending of all mime-types through ACTION_HANDOVER_SEND and ACTION_HANDOVER_SEND_MULTIPLE. These intent actions are only used by NFC when doing handover transfers, and require the whitelisting permission that is only granted to system applications. Similarly, for receiving, we will still reject certain mimetypes, except if the transfer was whitelisted because it was a handover transfer. At this moment, only the NFC service has the signature permission required for whitelisting. This change also allows to send files without extension, as long as OPP has a valid mimeType. This is useful when using OPP in combination with a content provider, which may specify filenames without any extension but with a valid mime-type. Bug: 6561169 Change-Id: Ia39418de6bcb2f8af678c7b8637b63b1697eb493
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1883ba9ef..735fabfd6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -67,6 +67,16 @@
<action android:name="android.btopp.intent.action.WHITELIST_DEVICE" />
<action android:name="android.btopp.intent.action.STOP_HANDOVER_TRANSFER" />
</intent-filter>
+ <intent-filter>
+ <action android:name="android.btopp.intent.action.HANDOVER_SEND" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="*/*" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.btopp.intent.action.HANDOVER_SEND_MULTIPLE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="*/*" />
+ </intent-filter>
</receiver>
<activity android:name=".opp.BluetoothOppLauncherActivity"
android:process="@string/process"