diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-09-10 22:00:05 -0700 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2009-09-11 14:12:48 -0700 |
| commit | 32d8571f509c392dca732c243e9b2138c15daecf (patch) | |
| tree | 8a1358f522c834cd80b098a2810c74e333980a65 /core/jni/android_server_BluetoothService.cpp | |
| parent | 162ec9993e9695946a6b954fd53eebb63e055540 (diff) | |
| download | frameworks_base-32d8571f509c392dca732c243e9b2138c15daecf.zip frameworks_base-32d8571f509c392dca732c243e9b2138c15daecf.tar.gz frameworks_base-32d8571f509c392dca732c243e9b2138c15daecf.tar.bz2 | |
Changes for BT 2.1
1) Handle incoming 2.1 pairing requests
2) Modify displaying error messages on bond failures.
3) Add delay while accepting incoming pairing for certain 2.1 devices.
When MITM is on, the link key request might come more than once.
Auto accept with a delay.
4) Handle DisplayPasskey callback for pairing a 2.1 keyboard with
a 2.1 device
Diffstat (limited to 'core/jni/android_server_BluetoothService.cpp')
| -rw-r--r-- | core/jni/android_server_BluetoothService.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_server_BluetoothService.cpp b/core/jni/android_server_BluetoothService.cpp index de921f1..0b71acb 100644 --- a/core/jni/android_server_BluetoothService.cpp +++ b/core/jni/android_server_BluetoothService.cpp @@ -455,8 +455,8 @@ static jboolean setPairingConfirmationNative(JNIEnv *env, jobject object, } if (!reply) { - LOGE("%s: Cannot create message reply to RequestConfirmation to " - "D-Bus\n", __FUNCTION__); + LOGE("%s: Cannot create message reply to RequestPasskeyConfirmation or" + "RequestPairingConsent to D-Bus\n", __FUNCTION__); dbus_message_unref(msg); return JNI_FALSE; } |