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

Merge change 25970 into eclair

Browse Source 
* changes:
  Make removeBond() call async.
This commit is contained in:
Android (Google) Code Review
2009-09-20 16:14:54 -04:00
parent 3a66413af3 995ae82f38
commit 0647b580aa
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) { static jboolean removeDeviceNative(JNIEnv *env, jobject object, jstring object_path) {
LOGV(__FUNCTION__); LOGV(__FUNCTION__);
jboolean result = JNI_FALSE;
#ifdef HAVE_BLUETOOTH #ifdef HAVE_BLUETOOTH
native_data_t *nat = get_native_data(env, object); native_data_t *nat = get_native_data(env, object);
if (nat) { if (nat) {
const char *c_object_path = env->GetStringUTFChars(object_path, NULL); const char *c_object_path = env->GetStringUTFChars(object_path, NULL);
DBusError err; bool ret = dbus_func_args_async(env, nat->conn, -1,
dbus_error_init(&err); NULL,
DBusMessage *reply = NULL,
dbus_func_args_error(env, nat->conn, &err, NULL,
get_adapter_path(env, object), get_adapter_path(env, object),
DBUS_ADAPTER_IFACE, "RemoveDevice", DBUS_ADAPTER_IFACE,
DBUS_TYPE_OBJECT_PATH, &c_object_path, "RemoveDevice",
DBUS_TYPE_INVALID); DBUS_TYPE_OBJECT_PATH, &c_object_path,
if (!reply) { DBUS_TYPE_INVALID);
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;
}
env->ReleaseStringUTFChars(object_path, c_object_path); env->ReleaseStringUTFChars(object_path, c_object_path);
if (reply) dbus_message_unref(reply); return ret ? JNI_TRUE : JNI_FALSE;
} }
#endif #endif
return result; return JNI_FALSE;
} }
static jint enableNative(JNIEnv *env, jobject object) { static jint enableNative(JNIEnv *env, jobject object) {