diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-11-18 16:38:08 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-11-18 16:38:08 -0800 |
| commit | ffe9bc68c245fe23c21a54b3c222d5c69256dccc (patch) | |
| tree | df9f26faad366345afa7f0e3567cbc75be966d46 /emulator | |
| parent | 8b9a6e6442b9cc7ab2eb3c5428d8f18a250e63ea (diff) | |
| parent | ac65eedb55f42baaea04a1493060596bcd507636 (diff) | |
| download | sdk-ffe9bc68c245fe23c21a54b3c222d5c69256dccc.zip sdk-ffe9bc68c245fe23c21a54b3c222d5c69256dccc.tar.gz sdk-ffe9bc68c245fe23c21a54b3c222d5c69256dccc.tar.bz2 | |
merge from open-source master
Change-Id: Idf12fbcb5508ca53047fcde3c35a96f9a971d305
Diffstat (limited to 'emulator')
| -rw-r--r-- | emulator/qemud/qemud.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/emulator/qemud/qemud.c b/emulator/qemud/qemud.c index 92b2a2b..e1c7b54 100644 --- a/emulator/qemud/qemud.c +++ b/emulator/qemud/qemud.c @@ -541,6 +541,7 @@ looper_loop( Looper* l ) /* now remove all the hooks that were closed by * the callbacks */ for (n = 0; n < l->num_fds;) { + struct epoll_event ev; LoopHook* hook = l->hooks + n; if (!(hook->state & HOOK_CLOSING)) { @@ -550,6 +551,9 @@ looper_loop( Looper* l ) hook[0] = l->hooks[l->num_fds-1]; l->num_fds -= 1; + ev.events = hook->wanted; + ev.data.ptr = hook; + epoll_ctl( l->epoll_fd, EPOLL_CTL_MOD, hook->fd, &ev ); } } } |