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

Merge change 1192 into donut

Browse Source 
* changes:
  Fix 1825581 - device restarts when using A2DP.
This commit is contained in:
Android (Google) Code Review
2009-05-08 11:41:47 -07:00
parent 3a6645a1cb 704e00ab7b
commit 672f1e2b07
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/jni/android_server_BluetoothA2dpService.cpp
View File

@@ -45,7 +45,8 @@ static jmethodID method_onSinkPlaying;
static jmethodID method_onSinkStopped; static jmethodID method_onSinkStopped;
typedef struct { typedef struct {
JNIEnv *env; JavaVM *vm;
int envVer;
DBusConnection *conn; DBusConnection *conn;
jobject me; // for callbacks to java jobject me; // for callbacks to java
} native_data_t; } native_data_t;
@@ -70,7 +71,8 @@ static bool initNative(JNIEnv* env, jobject object) {
LOGE("%s: out of memory!", __FUNCTION__); LOGE("%s: out of memory!", __FUNCTION__);
return false; return false;
} }
nat->env = env; env->GetJavaVM( &(nat->vm) );
nat->envVer = env->GetVersion();
nat->me = env->NewGlobalRef(object); nat->me = env->NewGlobalRef(object);
DBusError err; DBusError err;
@@ -239,8 +241,14 @@ static void onConnectSinkResult(DBusMessage *msg, void *user, void *natData) {
char *c_path = (char *)user; char *c_path = (char *)user;
DBusError err; DBusError err;
JNIEnv *env;
if (nat->vm->GetEnv((void**)&env, nat->envVer) < 0) {
LOGE("%s: error finding Env for our VM\n", __FUNCTION__);
return;
}
dbus_error_init(&err); dbus_error_init(&err);
JNIEnv *env = nat->env;
LOGV("... path = %s", c_path); LOGV("... path = %s", c_path);
if (dbus_set_error_from_message(&err, msg)) { if (dbus_set_error_from_message(&err, msg)) {
@@ -264,8 +272,14 @@ static void onDisconnectSinkResult(DBusMessage *msg, void *user, void *natData)
char *c_path = (char *)user; char *c_path = (char *)user;
DBusError err; DBusError err;
JNIEnv *env;
if (nat->vm->GetEnv((void**)&env, nat->envVer) < 0) {
LOGE("%s: error finding Env for our VM\n", __FUNCTION__);
return;
}
dbus_error_init(&err); dbus_error_init(&err);
JNIEnv *env = nat->env;
LOGV("... path = %s", c_path); LOGV("... path = %s", c_path);
if (dbus_set_error_from_message(&err, msg)) { if (dbus_set_error_from_message(&err, msg)) {