diff options
| author | Michael Chan <mchan@android.com> | 2009-09-26 06:16:17 -0700 |
|---|---|---|
| committer | Michael Chan <mchan@android.com> | 2009-09-28 17:16:23 -0700 |
| commit | e1089ad33896f4fe5b75e773813367d700773b6f (patch) | |
| tree | 44c810c0ac97672fc29ce8a0d7efe029cf3a8daa /AndroidManifest.xml | |
| parent | c63742c8fa533b6fc879f12ccecc2a51c1aca23b (diff) | |
| download | packages_apps_settings-e1089ad33896f4fe5b75e773813367d700773b6f.zip packages_apps_settings-e1089ad33896f4fe5b75e773813367d700773b6f.tar.gz packages_apps_settings-e1089ad33896f4fe5b75e773813367d700773b6f.tar.bz2 | |
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
Change-Id: I6da1598661ad05b4cfd2b7cc81e05d3053df5777
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 19 |
1 files changed, 19 insertions, 0 deletions
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" /> |