| commit | ddd7b58149a0ad3406d3ec070b2a31b8b06421e1 | [log] [tgz] |
|---|---|---|
| author | Yu Shan <shanyu@google.com> | Thu Jun 29 18:33:04 2023 -0700 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Fri Jun 30 20:55:19 2023 +0000 |
| tree | dcdc15f66c97128f02c0c3ac32b12e6eb57994c5 | |
| parent | 50c033fe790238ea0847c9acc77f15c1537aac9d [diff] |
Fix a type conversion bug. Convert int64_t to long on x86 platform loses info. Test: atest FakeVehicleHardwareTest on cf_gwear_x86. Bug: 288376096 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:76aaef448fcd9458b07b1d78ea4b79165af0cde0) Merged-In: I8826e2c0ba6c3e26af858a1d8f1388b75d537082 Change-Id: I8826e2c0ba6c3e26af858a1d8f1388b75d537082
diff --git a/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/include/LinearFakeValueGenerator.h b/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/include/LinearFakeValueGenerator.h index d2b701d..2378676 100644 --- a/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/include/LinearFakeValueGenerator.h +++ b/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/include/LinearFakeValueGenerator.h
@@ -57,7 +57,7 @@ float dispersion; // Defines minimum and maximum value based on initial value. float increment; // Value that we will be added to currentValue with each timer tick. int64_t interval; - long lastEventTimestamp; + int64_t lastEventTimestamp; }; GeneratorCfg mGenCfg;
diff --git a/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/src/LinearFakeValueGenerator.cpp b/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/src/LinearFakeValueGenerator.cpp index 9133144..fe08dcf 100644 --- a/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/src/LinearFakeValueGenerator.cpp +++ b/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/src/LinearFakeValueGenerator.cpp
@@ -86,7 +86,7 @@ if (mGenCfg.lastEventTimestamp == 0) { mGenCfg.lastEventTimestamp = elapsedRealtimeNano(); } else { - long nextEventTime = mGenCfg.lastEventTimestamp + mGenCfg.interval; + int64_t nextEventTime = mGenCfg.lastEventTimestamp + mGenCfg.interval; // Prevent overflow. assert(nextEventTime > mGenCfg.lastEventTimestamp); mGenCfg.lastEventTimestamp = nextEventTime;