| commit | 3c745ce814f12353be22c48d20f5ccb6bf57533f | [log] [tgz] |
|---|---|---|
| author | Donghong Weng <donghongweng@google.com> | Mon Aug 22 02:07:57 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 22 02:07:57 2022 +0000 |
| tree | 3a6505be4d0d736e8ec802bddc4a9119d3643d5f | |
| parent | a80338f80262a94b544874e4b1465595f9f543f9 [diff] | |
| parent | 160a22f49e7358e18d87990e2bd5a8bcad08cd23 [diff] |
Merge "Explicit conversion" am: 160a22f49e Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2186215 Change-Id: Icde93ba9318a7fc90c6d65f801aa402a466d7e99 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp index 791d7e8..f50a5e7 100644 --- a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp +++ b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp
@@ -444,7 +444,7 @@ effect.delayMs = std::rand() % (maxDelay + 1); 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); if (composite.size() == maxSize) {