commit af8be3f58b905f3c12f740564cb449b81105a992
author Eric Laurent <elaurent@google.com> Fri Jun 23 08:13:35 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 23 08:13:35 2023 +0000
tree 2807fde0e5326c1d2dbb413f25f2bc6bc4c7f65a
parent 9c1d9c152b2257044c49b908e3e749ca2f8de1cd
parent fcf15bf486b4324d00d1f9d8c7b8f27a6b1db0a1

Merge changes I6923e891,Id5c62c31

* changes:
  audioflinger: effect: fix deadlock after dumpsys
  audioeffect: fix segfault on device effect configuration

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 35edf3a..8cca719 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -1006,8 +1006,9 @@
     // mConfig.outputCfg.buffer.frameCount cannot be zero.
     mMaxDisableWaitCnt = (uint32_t)std::max(
             (uint64_t)1, // mMaxDisableWaitCnt must be greater than zero.
-            (uint64_t)MAX_DISABLE_TIME_MS * mConfig.outputCfg.samplingRate
-                / ((uint64_t)1000 * mConfig.outputCfg.buffer.frameCount));
+            (uint64_t)mConfig.outputCfg.buffer.frameCount == 0 ? 1
+                : (MAX_DISABLE_TIME_MS * mConfig.outputCfg.samplingRate
+                / ((uint64_t)1000 * mConfig.outputCfg.buffer.frameCount)));
 
 exit:
     // TODO: consider clearing mConfig on error.
@@ -3520,7 +3521,7 @@
     }
 
     if (locked) {
-        mLock.unlock();
+        mProxyLock.unlock();
     }
 }