Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1575202b authored by David Ding's avatar David Ding Committed by Android Git Automerger
Browse files

am 7a013f96: Fix vold coredump when enable_ums cmd comes without media inserted. 

Merge commit '7a013f96' into eclair-plus-aosp

* commit '7a013f96':
  Fix vold coredump when enable_ums cmd comes without media inserted.
parents 3e425728 7a013f96

vold/volmgr.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -460,7 +460,7 @@ int volmgr_enable_ums(boolean enable) 
                pthread_mutex_lock(&v->lock);

                pthread_mutex_lock(&v->lock);

                if (v->state == volstate_mounted)

                if (v->state == volstate_mounted)

                    volmgr_send_eject_request(v);

                    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);

                    pthread_mutex_unlock(&v->lock);

                    goto next_vol;

                    goto next_vol;

                }

                }