diff options
| author | Andres Morales <anmorales@google.com> | 2014-03-11 08:56:54 -0700 |
|---|---|---|
| committer | Andres Morales <anmorales@google.com> | 2014-04-03 16:02:19 -0700 |
| commit | cfaffa85e4a5388f3591bb17f88fc7768676eae2 (patch) | |
| tree | ab8934a47355cc2627f1272b9e4de707d22b9ea3 /AndroidManifest.xml | |
| parent | 7903540c80a44140966ad8a4c9e30907494e2e18 (diff) | |
| download | android_packages_apps_Bluetooth-cfaffa85e4a5388f3591bb17f88fc7768676eae2.tar.gz android_packages_apps_Bluetooth-cfaffa85e4a5388f3591bb17f88fc7768676eae2.tar.bz2 android_packages_apps_Bluetooth-cfaffa85e4a5388f3591bb17f88fc7768676eae2.zip | |
Making Bluetooth OPP file transfer intent generic
In the process of adding Wifi as a transport for Beam,
the only consumer of this code as of yet. Need to decouple
the file transfer events from the bluetooth stack to be able
to cleanly reuse them in the wifi code.
Change-Id: I9dafe4f6756bf429b4770826c46d41330a334493
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0d20a5aea..95f5d1b83 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,12 +17,6 @@ android:description="@string/permdesc_bluetoothWhitelist" android:protectionLevel="signature" /> - <!-- Allows receiving handover status broadcasts from Bluetooth -->, - <permission android:name="com.android.permission.HANDOVER_STATUS" - android:label="@string/permlab_handoverStatus" - android:description="@string/permdesc_handoverStatus" - android:protectionLevel="signature" /> - <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.ACCESS_BLUETOOTH_SHARE" /> <uses-permission android:name="android.permission.INTERNET" /> @@ -35,7 +29,7 @@ <uses-permission android:name="android.permission.READ_CALL_LOG" /> <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.WRITE_SETTINGS" /> - <uses-permission android:name="com.android.permission.HANDOVER_STATUS" /> + <uses-permission android:name="android.permission.NFC_HANDOVER_STATUS" /> <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <uses-permission android:name="android.permission.NET_ADMIN" /> <uses-permission android:name="android.permission.CALL_PRIVILEGED" /> @@ -108,12 +102,12 @@ <action android:name="android.btopp.intent.action.STOP_HANDOVER_TRANSFER" /> </intent-filter> <intent-filter> - <action android:name="android.btopp.intent.action.HANDOVER_SEND" /> + <action android:name="android.nfc.handover.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" /> + <action android:name="android.nfc.handover.intent.action.HANDOVER_SEND_MULTIPLE" /> <category android:name="android.intent.category.DEFAULT" /> <data android:mimeType="*/*" /> </intent-filter> |