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

Commit c82d846b authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "Haptic Generator : Modify setHgHapticScales method to use const... 

Merge "Haptic Generator : Modify setHgHapticScales method to use const reference." am: a213cc0e am: 0ce6def9 am: 37eb5a0a

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



Change-Id: Ifd85038264ebba5763002b6dfe8767e4f7fd41fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6500c20 37eb5a0a

media/libeffects/hapticgenerator/aidl/HapticGeneratorContext.cpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ void HapticGeneratorContext::reset() { 
}



RetCode HapticGeneratorContext::setHgHapticScales(

        const std::vector<HapticGenerator::HapticScale> hapticScales) {

        const std::vector<HapticGenerator::HapticScale>& hapticScales) {

    std::lock_guard lg(mMutex);

    for (auto hapticScale : hapticScales) {

        mParams.mHapticScales.insert_or_assign(hapticScale.id, hapticScale.scale);

media/libeffects/hapticgenerator/aidl/HapticGeneratorContext.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class HapticGeneratorContext final : public EffectContext { 
    RetCode disable();

    void reset();



    RetCode setHgHapticScales(const std::vector<HapticGenerator::HapticScale> hapticScales);

    RetCode setHgHapticScales(const std::vector<HapticGenerator::HapticScale>& hapticScales);

    std::vector<HapticGenerator::HapticScale> getHgHapticScales();



    RetCode setHgVibratorInformation(const HapticGenerator::VibratorInformation& vibratorInfo);