diff options
| author | Andres Morales <anmorales@google.com> | 2014-06-25 22:24:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-25 17:34:05 +0000 |
| commit | f3997eb0ef29986e9e27fb81f0667c2f19fae07f (patch) | |
| tree | 6a3623c7ac3c719ade45b0da6f6995002bf3a879 /AndroidManifest.xml | |
| parent | 9cf6c591c43c4dba90b5c2e26a5f93368682c9cc (diff) | |
| parent | cfaffa85e4a5388f3591bb17f88fc7768676eae2 (diff) | |
| download | android_packages_apps_Bluetooth-f3997eb0ef29986e9e27fb81f0667c2f19fae07f.tar.gz android_packages_apps_Bluetooth-f3997eb0ef29986e9e27fb81f0667c2f19fae07f.tar.bz2 android_packages_apps_Bluetooth-f3997eb0ef29986e9e27fb81f0667c2f19fae07f.zip | |
Merge "Making Bluetooth OPP file transfer intent generic"
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 770556ba7..aa18d33dc 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.WRITE_APN_SETTINGS" /> <uses-permission android:name="android.permission.NET_ADMIN" /> @@ -109,12 +103,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> |