Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33e9c081 authored by Donghong Weng's avatar Donghong Weng Committed by Automerger Merge Worker
Browse files

Merge "Explicit conversion" am: 160a22f4 am: 3c745ce8 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2186215



Change-Id: Iab95ab07fe0a63dd705c6e12f7754c8850473d28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89b620d1 3c745ce8

vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -444,7 +444,7 @@ TEST_P(VibratorAidl, ComposeValidPrimitives) { 




            effect.delayMs = std::rand() % (maxDelay + 1);

            effect.delayMs = std::rand() % (maxDelay + 1);

            effect.primitive = primitive;

            effect.primitive = primitive;

            effect.scale = static_cast<float>(std::rand()) / RAND_MAX;

            effect.scale = static_cast<float>(std::rand()) / static_cast<float>(RAND_MAX);

            composite.emplace_back(effect);

            composite.emplace_back(effect);





            if (composite.size() == maxSize) {

            if (composite.size() == maxSize) {