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/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 7c7d812..7f13261 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -5209,7 +5209,7 @@
// audio to FastMixer
fastTrack->mFormat = mFormat; // mPipeSink format for audio to FastMixer
fastTrack->mHapticPlaybackEnabled = mHapticChannelMask != AUDIO_CHANNEL_NONE;
- fastTrack->mHapticScale = {/*level=*/os::HapticLevel::NONE };
+ fastTrack->mHapticScale = os::HapticScale::none();
fastTrack->mHapticMaxAmplitude = NAN;
fastTrack->mGeneration++;
state->mFastTracksGen++;