| commit | 33e9c08107064bbee7dab7389cb3906b198411a3 | [log] [tgz] |
|---|---|---|
| author | Donghong Weng <donghongweng@google.com> | Mon Aug 22 02:27:34 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 22 02:27:34 2022 +0000 |
| tree | 2c2ce898be8b32c234252298b179c1875918f76a | |
| parent | 89b620d11718f3241833505308c0d0ee0cd7a759 [diff] | |
| parent | 3c745ce814f12353be22c48d20f5ccb6bf57533f [diff] |
Merge "Explicit conversion" am: 160a22f49e am: 3c745ce814 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2186215 Change-Id: Iab95ab07fe0a63dd705c6e12f7754c8850473d28 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) {