commit c7731ac50e76a7bc133f71846d9ed5d423aeb54a
author Eric Laurent <elaurent@google.com> Tue May 14 15:44:43 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 14 15:44:43 2013 +0000
tree b54b92054beb40f554b4c84c968f2726fd75848f
parent 8dbaa56a9de51d506977bda112f75b8af50920e9
parent 1e27c22a3a024a7ba193ec48b9ec13d1ea0f03c6

Merge "Fix unreleased mutex in ToneGenerator stopTone()" into jb-mr2-dev

media/libmedia/ToneGenerator.cpp

diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index f09ce75..f55b697 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -1012,6 +1012,7 @@
         if (lStatus == NO_ERROR) {
             // If the tone was restarted exit now before calling clearWaveGens();
             if (mState != TONE_INIT) {
+                mLock.unlock();
                 return;
             }
             ALOGV("track stop complete, time %d", (unsigned int)(systemTime()/1000000));