commit 4bf946a252ff33534fd2739fda7619f0c55dc8d7
author Andy Hung <hunga@google.com> Wed Nov 15 16:21:05 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 15 16:21:05 2023 +0000
tree 872fd927954139425b611bd59732a0c48f58a11a
parent 636a5b506d5f09c17f9c5bcd5610e30451886d23
parent a950874cde58f848df6f9a9f691991c693698a13

Merge "Effects: sets mVolumeControlEffect" into main

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 0f3e130..be93ef9 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -2570,6 +2570,7 @@
             uint32_t rightZero = 0;
             volumeControlEffect->setVolume(&leftZero, &rightZero, true /*controller*/);
         }
+        mVolumeControlEffect = volumeControlEffect;
     }
     mLeftVolume = newLeft;
     mRightVolume = newRight;

services/audioflinger/Effects.h

diff --git a/services/audioflinger/Effects.h b/services/audioflinger/Effects.h
index aeb0fea..6b1d9cf 100644
--- a/services/audioflinger/Effects.h
+++ b/services/audioflinger/Effects.h
@@ -648,7 +648,7 @@
 
              const sp<EffectCallback> mEffectCallback;
 
-             wp<EffectModule> mVolumeControlEffect;
+             wp<IAfEffectModule> mVolumeControlEffect;
 };
 
 class DeviceEffectProxy : public IAfDeviceEffectProxy, public EffectBase {