Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76c22f18 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android (Google) Code Review
Browse files

Merge "Set error condition correctly when device is already created."

parents f43113f6 cf5f6527

core/jni/android_server_BluetoothEventLoop.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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,