commit e1089ad33896f4fe5b75e773813367d700773b6f
author Michael Chan <mchan@android.com> Sat Sep 26 06:16:17 2009 -0700
committer Michael Chan <mchan@android.com> Mon Sep 28 17:16:23 2009 -0700
tree 44c810c0ac97672fc29ce8a0d7efe029cf3a8daa
parent c63742c8fa533b6fc879f12ccecc2a51c1aca23b

b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.

Change-Id: I6da1598661ad05b4cfd2b7cc81e05d3053df5777

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5225b9b..0af6866 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -487,6 +487,25 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".bluetooth.RequestPermissionActivity"
+                  android:label="@string/bluetooth_permission_request"
+                  android:excludeFromRecents="true"
+                  android:permission="android.permission.BLUETOOTH"
+                  android:theme="@*android:style/Theme.Dialog.Alert">
+            <intent-filter>
+                <action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
+                <action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".bluetooth.RequestPermissionHelperActivity"
+                  android:label="@string/bluetooth_pairing_request"
+                  android:excludeFromRecents="true"
+                  android:permission="android.permission.BLUETOOTH"
+                  android:theme="@*android:style/Theme.Dialog.Alert">
+        </activity>
+
         <receiver android:name=".bluetooth.BluetoothPairingRequest">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />