tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a type conversion bug.

Browse source 
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
This commit is contained in:
Yu Shan 2023-06-29 18:33:04 -07:00 committed by Cherrypicker Worker
parent 50c033fe79
commit ddd7b58149
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/include/LinearFakeValueGenerator.h
View file

@ -57,7 +57,7 @@ class LinearFakeValueGenerator : public FakeValueGenerator {
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;

2
automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/src/LinearFakeValueGenerator.cpp
View file

@ -86,7 +86,7 @@ std::optional<VehiclePropValue> LinearFakeValueGenerator::nextEvent() {
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;