diff options
| author | Matthew Xie <mattx@google.com> | 2011-06-28 13:53:56 -0700 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2011-06-29 23:56:17 -0700 |
| commit | 7eab97d6be9228b1c210bbb171c3e5e88e02f3d8 (patch) | |
| tree | 0a78906a0e8159d612f0a089d32cb2d8b7c423c0 /AndroidManifest.xml | |
| parent | 1e8134d9d0cfd246b1e0910aeb1618adea84505f (diff) | |
| download | android_packages_apps_Bluetooth-7eab97d6be9228b1c210bbb171c3e5e88e02f3d8.tar.gz android_packages_apps_Bluetooth-7eab97d6be9228b1c210bbb171c3e5e88e02f3d8.tar.bz2 android_packages_apps_Bluetooth-7eab97d6be9228b1c210bbb171c3e5e88e02f3d8.zip | |
Move Pbap permission dialog to Settings app.
Strings and diglog are removed and will reappear and modified in Settings
app. We want phone AT commander to use the dialog too.
bug 4489572
Change-Id: I0283b5deff974e53384dc5a92bd01c02e12bbcd6
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bbba0df90..846d1691f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -136,6 +136,8 @@ android:name=".pbap.BluetoothPbapReceiver"> <intent-filter> <action android:name="android.bluetooth.adapter.action.STATE_CHANGED"/> + <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REPLY" /> + <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </receiver> </application> |