From 2724d61255fc121c3eb86e778237429d42d9d79e Mon Sep 17 00:00:00 2001
From: Chase Wu <chasewu@google.com>
Date: Tue, 17 Jan 2023 20:14:47 +0800
Subject: [PATCH] [DO NOT MERGE] vibrator/cs40l26: Fix unsupport primitive
 effects test

Bug: 264219822
Test: atest Vibrator/VibratorAidl#ComposeUnsupportedPrimitives/TOP_LEVEL_VIBRATOR_0
Change-Id: I736e509bcd1e8004c144744e06c63cc35b6fbfb2
---
 vibrator/cs40l26/Vibrator.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/vibrator/cs40l26/Vibrator.cpp b/vibrator/cs40l26/Vibrator.cpp
index 0b26730..131a376 100644
--- a/vibrator/cs40l26/Vibrator.cpp
+++ b/vibrator/cs40l26/Vibrator.cpp
@@ -765,16 +765,15 @@ ndk::ScopedAStatus Vibrator::compose(const std::vector<CompositeEffect> &composi
             return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
         }
 
-        if(effectScale < mPrimitiveMinScale[static_cast<uint32_t>(e_curr.primitive)]) {
-            effectScale = mPrimitiveMinScale[static_cast<uint32_t>(e_curr.primitive)];
-        }
-
         if (e_curr.primitive != CompositePrimitive::NOOP) {
             ndk::ScopedAStatus status;
             status = getPrimitiveDetails(e_curr.primitive, &effectIndex);
             if (!status.isOk()) {
                 return status;
             }
+            if (effectScale < mPrimitiveMinScale[static_cast<uint32_t>(e_curr.primitive)]) {
+                effectScale = mPrimitiveMinScale[static_cast<uint32_t>(e_curr.primitive)];
+            }
             effectVolLevel = intensityToVolLevel(effectScale, effectIndex);
             totalDuration += mEffectDurations[effectIndex];
         }