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

Merge change 25382 into eclair

Browse Source 
* changes:
  Fix async calls with Connect And Disconnect Sink.
This commit is contained in:
Android (Google) Code Review
2009-09-16 20:37:08 -04:00
parent 2f20df194f 4f3ebc43af
commit cfc7f1aaef
1 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/jni/android_server_BluetoothA2dpService.cpp
View File

@@ -133,23 +133,13 @@ static jboolean connectSinkNative(JNIEnv *env, jobject object, jstring path) {
LOGV(__FUNCTION__); LOGV(__FUNCTION__);
if (nat) { if (nat) {
const char *c_path = env->GetStringUTFChars(path, NULL); const char *c_path = env->GetStringUTFChars(path, NULL);
DBusError err;
dbus_error_init(&err);
DBusMessage *reply = bool ret = dbus_func_args_async(env, nat->conn, -1, NULL, NULL, nat,
dbus_func_args_timeout(env, nat->conn, -1, c_path, c_path, "org.bluez.AudioSink", "Connect",
"org.bluez.AudioSink", "Connect", DBUS_TYPE_INVALID);
DBUS_TYPE_INVALID);
env->ReleaseStringUTFChars(path, c_path); env->ReleaseStringUTFChars(path, c_path);
return ret ? JNI_TRUE : JNI_FALSE;
if (!reply && dbus_error_is_set(&err)) {
LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply);
return JNI_FALSE;
} else if (!reply) {
LOGE("DBus reply is NULL in function %s", __FUNCTION__);
return JNI_FALSE;
}
return JNI_TRUE;
} }
#endif #endif
return JNI_FALSE; return JNI_FALSE;
@@ -161,23 +151,13 @@ static jboolean disconnectSinkNative(JNIEnv *env, jobject object,
LOGV(__FUNCTION__); LOGV(__FUNCTION__);
if (nat) { if (nat) {
const char *c_path = env->GetStringUTFChars(path, NULL); const char *c_path = env->GetStringUTFChars(path, NULL);
DBusError err;
dbus_error_init(&err);
DBusMessage *reply = bool ret = dbus_func_args_async(env, nat->conn, -1, NULL, NULL, nat,
dbus_func_args_timeout(env, nat->conn, -1, c_path, c_path, "org.bluez.AudioSink", "Disconnect",
"org.bluez.AudioSink", "Disconnect", DBUS_TYPE_INVALID);
DBUS_TYPE_INVALID);
env->ReleaseStringUTFChars(path, c_path); env->ReleaseStringUTFChars(path, c_path);
return ret ? JNI_TRUE : JNI_FALSE;
if (!reply && dbus_error_is_set(&err)) {
LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply);
return JNI_FALSE;
} else if (!reply) {
LOGE("DBus reply is NULL in function %s", __FUNCTION__);
return JNI_FALSE;
}
return JNI_TRUE;
} }
#endif #endif
return JNI_FALSE; return JNI_FALSE;