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

am cfc7f1aa: Merge change 25382 into eclair

Browse Source 
Merge commit 'cfc7f1aaefa60f43e27969690a939f664ff1c678' into eclair-plus-aosp

* commit 'cfc7f1aaefa60f43e27969690a939f664ff1c678':
  Fix async calls with Connect And Disconnect Sink.
This commit is contained in:
Jaikumar Ganesh
2009-09-17 08:43:56 -07:00
committed by Android Git Automerger
parent 8fab7265a5 cfc7f1aaef
commit 7a00336cad
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__);
if (nat) {
const char *c_path = env->GetStringUTFChars(path, NULL);
DBusError err;
dbus_error_init(&err);
DBusMessage *reply =
dbus_func_args_timeout(env, nat->conn, -1, c_path,
"org.bluez.AudioSink", "Connect",
DBUS_TYPE_INVALID);
bool ret = dbus_func_args_async(env, nat->conn, -1, NULL, NULL, nat,
c_path, "org.bluez.AudioSink", "Connect",
DBUS_TYPE_INVALID);
env->ReleaseStringUTFChars(path, c_path);
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;
return ret ? JNI_TRUE : JNI_FALSE;
}
#endif
return JNI_FALSE;
@@ -161,23 +151,13 @@ static jboolean disconnectSinkNative(JNIEnv *env, jobject object,
LOGV(__FUNCTION__);
if (nat) {
const char *c_path = env->GetStringUTFChars(path, NULL);
DBusError err;
dbus_error_init(&err);
DBusMessage *reply =
dbus_func_args_timeout(env, nat->conn, -1, c_path,
"org.bluez.AudioSink", "Disconnect",
DBUS_TYPE_INVALID);
bool ret = dbus_func_args_async(env, nat->conn, -1, NULL, NULL, nat,
c_path, "org.bluez.AudioSink", "Disconnect",
DBUS_TYPE_INVALID);
env->ReleaseStringUTFChars(path, c_path);
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;
return ret ? JNI_TRUE : JNI_FALSE;
}
#endif
return JNI_FALSE;