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

am c9dc19bb: Merge change 4668 into donut

Browse Source 
Merge commit 'c9dc19bb96d2d77ec50f6e40fc22d1ff615f2044'

* commit 'c9dc19bb96d2d77ec50f6e40fc22d1ff615f2044':
  Fix runtime restarts due to sending the wrong flags to dbus.
This commit is contained in:
Android (Google) Code Review
2009-06-18 15:43:34 -07:00
committed by The Android Open Source Project
parent e9c1970bbf c9dc19bb96
commit eba76ad5c8
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/jni/android_server_BluetoothEventLoop.cpp
View File

@@ -149,6 +149,19 @@ static const DBusObjectPathVTable agent_vtable = {
NULL, agent_event_filter, NULL, NULL, NULL, NULL
};
static unsigned int unix_events_to_dbus_flags(short events) {
return (events & DBUS_WATCH_READABLE ? POLLIN : 0) |
(events & DBUS_WATCH_WRITABLE ? POLLOUT : 0) |
(events & DBUS_WATCH_ERROR ? POLLERR : 0) |
(events & DBUS_WATCH_HANGUP ? POLLHUP : 0);
}
static short dbus_flags_to_unix_events(unsigned int flags) {
return (flags & POLLIN ? DBUS_WATCH_READABLE : 0) |
(flags & POLLOUT ? DBUS_WATCH_WRITABLE : 0) |
(flags & POLLERR ? DBUS_WATCH_ERROR : 0) |
(flags & POLLHUP ? DBUS_WATCH_HANGUP : 0);
}
static jboolean setUpEventLoop(native_data_t *nat) {
LOGV(__FUNCTION__);
@@ -408,8 +421,7 @@ static void handleWatchAdd(native_data_t *nat) {
read(nat->controlFdR, &newFD, sizeof(int));
read(nat->controlFdR, &flags, sizeof(unsigned int));
read(nat->controlFdR, &watch, sizeof(DBusWatch *));
int events = (flags & DBUS_WATCH_READABLE ? POLLIN : 0)
| (flags & DBUS_WATCH_WRITABLE ? POLLOUT : 0);
short events = dbus_flags_to_unix_events(flags);
for (int y = 0; y<nat->pollMemberCount; y++) {
if ((nat->pollData[y].fd == newFD) &&
@@ -453,8 +465,7 @@ static void handleWatchRemove(native_data_t *nat) {
read(nat->controlFdR, &removeFD, sizeof(int));
read(nat->controlFdR, &flags, sizeof(unsigned int));
int events = (flags & DBUS_WATCH_READABLE ? POLLIN : 0)
| (flags & DBUS_WATCH_WRITABLE ? POLLOUT : 0);
short events = dbus_flags_to_unix_events(flags);
for (int y = 0; y < nat->pollMemberCount; y++) {
if ((nat->pollData[y].fd == removeFD) &&
@@ -518,13 +529,12 @@ static void *eventLoopMain(void *ptr) {
}
}
} else {
int event = nat->pollData[i].revents;
int flags = (event & POLLIN ? DBUS_WATCH_READABLE : 0) |
(event & POLLOUT ? DBUS_WATCH_WRITABLE : 0);
dbus_watch_handle(nat->watchData[i], event);
nat->pollData[i].revents = 0;
// can only do one - it may have caused a 'remove'
break;
short events = nat->pollData[i].revents;
unsigned int flags = unix_events_to_dbus_flags(events);
dbus_watch_handle(nat->watchData[i], flags);
nat->pollData[i].revents = 0;
// can only do one - it may have caused a 'remove'
break;
}
}
while (dbus_connection_dispatch(nat->conn) ==