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

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

Merge "Audio : Fix ASAN crash in VTS test cases" am: 5e311b67 am: 5a3a0907... 

Merge "Audio : Fix ASAN crash in VTS test cases" am: 5e311b67 am: 5a3a0907 am: 6a67f3ab am: e1c6db15

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2508735



Change-Id: I3223e2316481a13c8b55288ce971a3fc1255ff3b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 658ae7d1 e1c6db15

audio/aidl/vts/EffectHelper.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -228,10 +228,10 @@ class EffectHelper { 
     */

     */

    template <typename S, typename = std::enable_if_t<std::is_arithmetic_v<S>>>

    template <typename S, typename = std::enable_if_t<std::is_arithmetic_v<S>>>

    static std::set<S> expandTestValueBasic(std::set<S>& s) {

    static std::set<S> expandTestValueBasic(std::set<S>& s) {

        const auto min = *s.begin(), max = *s.rbegin();

        const auto minLimit = std::numeric_limits<S>::min(),

        const auto minLimit = std::numeric_limits<S>::min(),

                   maxLimit = std::numeric_limits<S>::max();

                   maxLimit = std::numeric_limits<S>::max();

        if (s.size()) {

        if (s.size()) {

            const auto min = *s.begin(), max = *s.rbegin();

            s.insert(min + (max - min) / 2);

            s.insert(min + (max - min) / 2);

            if (min != minLimit) {

            if (min != minLimit) {

                s.insert(min - 1);

                s.insert(min - 1);