diff options
| author | David Ding <david.j.ding@motorola.com> | 2009-09-15 15:24:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-15 15:24:53 -0700 |
| commit | 1575202b80942fbbdf770853e775bdad1e8bf87a (patch) | |
| tree | 2876dfc0db8931c707f768ee47831a2bcf2bef99 | |
| parent | 3e42572835a7d424545d63c04aff5b80ea18a045 (diff) | |
| parent | 7a013f967e6b6fdb3e7e2d46455cdf235ab4472e (diff) | |
| download | system_core-1575202b80942fbbdf770853e775bdad1e8bf87a.zip system_core-1575202b80942fbbdf770853e775bdad1e8bf87a.tar.gz system_core-1575202b80942fbbdf770853e775bdad1e8bf87a.tar.bz2 | |
am 7a013f96: Fix vold coredump when enable_ums cmd comes without media inserted.
Merge commit '7a013f967e6b6fdb3e7e2d46455cdf235ab4472e' into eclair-plus-aosp
* commit '7a013f967e6b6fdb3e7e2d46455cdf235ab4472e':
Fix vold coredump when enable_ums cmd comes without media inserted.
| -rw-r--r-- | vold/volmgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vold/volmgr.c b/vold/volmgr.c index 3c34a9c..61d0c4f 100644 --- a/vold/volmgr.c +++ b/vold/volmgr.c @@ -460,7 +460,7 @@ int volmgr_enable_ums(boolean enable) pthread_mutex_lock(&v->lock); if (v->state == volstate_mounted) volmgr_send_eject_request(v); - else if (v->state == volstate_ums) { + else if (v->state == volstate_ums || v->state == volstate_nomedia) { pthread_mutex_unlock(&v->lock); goto next_vol; } |