diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-02-18 13:46:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-18 13:46:33 -0800 |
| commit | 76c22f180ade373ea80a25fd927d559067e21950 (patch) | |
| tree | 820b6a939ae31d503a93df65c46b9e3ea6653263 /core | |
| parent | f43113f6216efacc3957fc48d9fa1c0326facceb (diff) | |
| parent | cf5f6527401bcbd9f558e41a5b067d4d02920dc7 (diff) | |
| download | frameworks_base-76c22f180ade373ea80a25fd927d559067e21950.zip frameworks_base-76c22f180ade373ea80a25fd927d559067e21950.tar.gz frameworks_base-76c22f180ade373ea80a25fd927d559067e21950.tar.bz2 | |
Merge "Set error condition correctly when device is already created."
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_server_BluetoothEventLoop.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp index 4e1ae62..5432efb 100644 --- a/core/jni/android_server_BluetoothEventLoop.cpp +++ b/core/jni/android_server_BluetoothEventLoop.cpp @@ -1122,9 +1122,10 @@ void onCreateDeviceResult(DBusMessage *msg, void *user, void *n) { if (dbus_set_error_from_message(&err, msg)) { if (dbus_error_has_name(&err, "org.bluez.Error.AlreadyExists")) { result = CREATE_DEVICE_ALREADY_EXISTS; + } else { + result = CREATE_DEVICE_FAILED; } LOG_AND_FREE_DBUS_ERROR(&err); - result = CREATE_DEVICE_FAILED; } env->CallVoidMethod(nat->me, method_onCreateDeviceResult, |