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

Commit adfd228b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audioflinger: initialize strategy to PRODUCT_STRATEGY_NONE" into main am: 0a8601d0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3165459



Change-Id: I9e26aa67c591fbf823f3ccfc7e9d414ce0a22168
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6e27133 0a8601d0

services/audioflinger/Effects.h

+2 −2
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ public: 
             uint32_t mRightVolume;      // previous volume on right channel

             uint32_t mNewLeftVolume;       // new volume on left channel

             uint32_t mNewRightVolume;      // new volume on right channel

             product_strategy_t mStrategy; // strategy for this effect chain

             product_strategy_t mStrategy = PRODUCT_STRATEGY_NONE; // strategy for this effect chain

             // mSuspendedEffects lists all effects currently suspended in the chain.

             // Use effect type UUID timelow field as key. There is no real risk of identical

             // timeLow fields among effect type UUIDs.
@@ -808,7 +808,7 @@ private: 
        void checkSuspendOnEffectEnabled(const sp<IAfEffectBase>& effect __unused,

                              bool enabled __unused, bool threadLocked __unused) override {}

        void resetVolume_l() override REQUIRES(audio_utils::EffectChain_Mutex) {}

        product_strategy_t strategy() const override  { return static_cast<product_strategy_t>(0); }

        product_strategy_t strategy() const override  { return PRODUCT_STRATEGY_NONE; }

        int32_t activeTrackCnt() const override { return 0; }

        void onEffectEnable(const sp<IAfEffectBase>& effect __unused) override;

        void onEffectDisable(const sp<IAfEffectBase>& effect __unused) override;