Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1781edd2: am 0647b580: Merge change 25970 into eclair

Browse Source 
Merge commit '1781edd28639b23443f9d319d1e5cea41acab8e9'

* commit '1781edd28639b23443f9d319d1e5cea41acab8e9':
  Make removeBond() call async.
This commit is contained in:
Jaikumar Ganesh
2009-09-20 13:30:06 -07:00
committed by Android Git Automerger
parent 0cc1f1db8f 1781edd286
commit 34e4f6267e
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/jni/android_server_BluetoothService.cpp
View File

@@ -387,33 +387,24 @@ static jboolean cancelDeviceCreationNative(JNIEnv *env, jobject object,
static jboolean removeDeviceNative(JNIEnv *env, jobject object, jstring object_path) {
LOGV(__FUNCTION__);
jboolean result = JNI_FALSE;
#ifdef HAVE_BLUETOOTH
native_data_t *nat = get_native_data(env, object);
if (nat) {
const char *c_object_path = env->GetStringUTFChars(object_path, NULL);
DBusError err;
dbus_error_init(&err);
DBusMessage *reply =
dbus_func_args_error(env, nat->conn, &err,
get_adapter_path(env, object),
DBUS_ADAPTER_IFACE, "RemoveDevice",
DBUS_TYPE_OBJECT_PATH, &c_object_path,
DBUS_TYPE_INVALID);
if (!reply) {
if (dbus_error_is_set(&err)) {
LOG_AND_FREE_DBUS_ERROR(&err);
} else
LOGE("DBus reply is NULL in function %s", __FUNCTION__);
result = JNI_FALSE;
} else {
result = JNI_TRUE;
}
bool ret = dbus_func_args_async(env, nat->conn, -1,
NULL,
NULL,
NULL,
get_adapter_path(env, object),
DBUS_ADAPTER_IFACE,
"RemoveDevice",
DBUS_TYPE_OBJECT_PATH, &c_object_path,
DBUS_TYPE_INVALID);
env->ReleaseStringUTFChars(object_path, c_object_path);
if (reply) dbus_message_unref(reply);
return ret ? JNI_TRUE : JNI_FALSE;
}
#endif
return result;
return JNI_FALSE;
}
static jint enableNative(JNIEnv *env, jobject object) {