vibrator: cs40l25: Fix compose() dropping primitives

hellobbn · hellobbn · commit 66547d8d7d81 · 2026-05-05T21:30:00.000+08:00
The "&lt;idx&gt;.&lt;volLevel&gt;" write was wrapped in USE_EFFECT_DURATION_POLLING,
so builds with use_compound_double_click_effect emitted no primitive
tokens to the effect queue. Move the write outside the guard; keep
mTotalDuration accounting inside.

Change-Id: I2cdb6f9fe8aa2325e0bd2f020c2c69aa40394766
diff --git a/aidl/vibrator/cs40l25/Vibrator.cpp b/aidl/vibrator/cs40l25/Vibrator.cpp
@@ -494,8 +494,9 @@ ndk::ScopedAStatus Vibrator::compose(const std::vector<CompositeEffect>& composi
                 return status;
             }
 
-#ifdef USE_EFFECT_DURATION_POLLING
             effectBuilder << effectIndex << "." << intensityToVolLevel(e.scale, effectIndex) << ",";
+
+#ifdef USE_EFFECT_DURATION_POLLING
             {
                 const std::scoped_lock<std::mutex> lock(mTotalDurationMutex);
                 mTotalDuration += mEffectDurations[effectIndex];

Original file line number	Diff line number	Diff line change
`@@ -494,8 +494,9 @@ ndk::ScopedAStatus Vibrator::compose(const std::vector<CompositeEffect>& composi`
`494`	`494`	`return status;`
`495`	`495`	`}`
`496`	`496`
`497`		`-#ifdef USE_EFFECT_DURATION_POLLING`
`498`	`497`	`effectBuilder << effectIndex << "." << intensityToVolLevel(e.scale, effectIndex) << ",";`
	`498`	`+`
	`499`	`+#ifdef USE_EFFECT_DURATION_POLLING`
`499`	`500`	`{`
`500`	`501`	`const std::scoped_lock<std::mutex> lock(mTotalDurationMutex);`
`501`	`502`	`mTotalDuration += mEffectDurations[effectIndex];`