Add field to HapticGenerator scale params
Add new float scale factor field to HapticGenerator audio effect params,
to forward the new field of os::HapticScale wrapper class to the scaling
helpers.
Bug: 356407385
Flag: android.os.vibrator.haptics_scale_v2_enabled
Test: manual
Change-Id: I3245e86c921fe847ca569a02bb7bd2b087d1d555
diff --git a/media/libaudioprocessing/AudioMixer.cpp b/media/libaudioprocessing/AudioMixer.cpp
index f9ae2d4..7ef9ff2 100644
--- a/media/libaudioprocessing/AudioMixer.cpp
+++ b/media/libaudioprocessing/AudioMixer.cpp
@@ -585,7 +585,7 @@
t->mPlaybackRate = AUDIO_PLAYBACK_RATE_DEFAULT;
// haptic
t->mHapticPlaybackEnabled = false;
- t->mHapticScale = {/*level=*/os::HapticLevel::NONE };
+ t->mHapticScale = os::HapticScale::none();
t->mHapticMaxAmplitude = NAN;
t->mMixerHapticChannelMask = AUDIO_CHANNEL_NONE;
t->mMixerHapticChannelCount = 0;