drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo

Browse Source
This commit is contained in:
Jaikumar Ganesh
2010-03-31 18:36:35 -07:00
committed by Android (Google) Code Review
parent 058e385b8b b8aa037602
commit 3a0d1d11eb
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_bluetooth_common.h
View File

@ -88,6 +88,8 @@ struct event_loop_native_data_t {
int envVer; int envVer;
/* reference to our java self */ /* reference to our java self */
jobject me; jobject me;
/* flag to indicate if the event loop thread is running */
bool running;
}; };
struct _Properties { struct _Properties {

7
core/jni/android_server_BluetoothEventLoop.cpp
View File

@ -548,6 +548,8 @@ static void *eventLoopMain(void *ptr) {
dbus_connection_set_watch_functions(nat->conn, dbusAddWatch, dbus_connection_set_watch_functions(nat->conn, dbusAddWatch,
dbusRemoveWatch, dbusToggleWatch, ptr, NULL); dbusRemoveWatch, dbusToggleWatch, ptr, NULL);
nat->running = true;
while (1) { while (1) {
for (int i = 0; i < nat->pollMemberCount; i++) { for (int i = 0; i < nat->pollMemberCount; i++) {
if (!nat->pollData[i].revents) { if (!nat->pollData[i].revents) {
@ -607,6 +609,8 @@ static jboolean startEventLoopNative(JNIEnv *env, jobject object) {
pthread_mutex_lock(&(nat->thread_mutex)); pthread_mutex_lock(&(nat->thread_mutex));
nat->running = false;
if (nat->pollData) { if (nat->pollData) {
LOGW("trying to start EventLoop a second time!"); LOGW("trying to start EventLoop a second time!");
pthread_mutex_unlock( &(nat->thread_mutex) ); pthread_mutex_unlock( &(nat->thread_mutex) );
@ -703,6 +707,7 @@ static void stopEventLoopNative(JNIEnv *env, jobject object) {
nat->controlFdW = 0; nat->controlFdW = 0;
close(fd); close(fd);
} }
nat->running = false;
pthread_mutex_unlock(&(nat->thread_mutex)); pthread_mutex_unlock(&(nat->thread_mutex));
#endif // HAVE_BLUETOOTH #endif // HAVE_BLUETOOTH
} }
@ -713,7 +718,7 @@ static jboolean isEventLoopRunningNative(JNIEnv *env, jobject object) {
native_data_t *nat = get_native_data(env, object); native_data_t *nat = get_native_data(env, object);
pthread_mutex_lock(&(nat->thread_mutex)); pthread_mutex_lock(&(nat->thread_mutex));
if (nat->pollData) { if (nat->running) {
result = JNI_TRUE; result = JNI_TRUE;
} }
pthread_mutex_unlock(&(nat->thread_mutex)); pthread_mutex_unlock(&(nat->thread_mutex));