| commit | c82d846b017ea616487001f62132276fd73787dc | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Wed Jan 25 00:13:42 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 25 00:13:42 2023 +0000 |
| tree | aa8a7ab5d9e92922f6b3fdb1ec039587f23f9476 | |
| parent | e6500c20316c337a4ae4e6accc83ee1ff81a4052 [diff] | |
| parent | 37eb5a0ab3e241fdfbc809994396fe6c206def3f [diff] |
Merge "Haptic Generator : Modify setHgHapticScales method to use const reference." am: a213cc0e52 am: 0ce6def9c3 am: 37eb5a0ab3 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2401034 Change-Id: Ifd85038264ebba5763002b6dfe8767e4f7fd41fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libeffects/hapticgenerator/aidl/HapticGeneratorContext.cpp b/media/libeffects/hapticgenerator/aidl/HapticGeneratorContext.cpp index 64f51c3..8ed579b 100644 --- a/media/libeffects/hapticgenerator/aidl/HapticGeneratorContext.cpp +++ b/media/libeffects/hapticgenerator/aidl/HapticGeneratorContext.cpp
@@ -67,7 +67,7 @@ } 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);
diff --git a/media/libeffects/hapticgenerator/aidl/HapticGeneratorContext.h b/media/libeffects/hapticgenerator/aidl/HapticGeneratorContext.h index dc43feb..a0a0a4c 100644 --- a/media/libeffects/hapticgenerator/aidl/HapticGeneratorContext.h +++ b/media/libeffects/hapticgenerator/aidl/HapticGeneratorContext.h
@@ -69,7 +69,7 @@ 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);