| commit | 0065ef783eca9b5e0abb230c422e05ac73d2eff7 | [log] [tgz] |
|---|---|---|
| author | Wu-cheng Li <wuchengli@google.com> | Thu Jul 28 17:23:35 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 28 17:23:35 2011 -0700 |
| tree | ca4e2535387f1175b6b9bbeb8e44b30161b5f9a4 | |
| parent | 6dbe883644940badc684957cfc381bfd115f205e [diff] | |
| parent | ff09ef8f18eed29bce50c7817df2fd52d2b50cf6 [diff] |
Merge "Add frame metadata parameter to camera data_callback."
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 4e068b2..ec45530 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp
@@ -1100,7 +1100,7 @@ void AudioFlinger::ThreadBase::releaseWakeLock() { Mutex::Autolock _l(mLock); - releaseWakeLock(); + releaseWakeLock_l(); } void AudioFlinger::ThreadBase::releaseWakeLock_l()