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

Commit ddd7b581 authored by Yu Shan's avatar Yu Shan Committed by Cherrypicker Worker
Browse files

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
parent 50c033fe

automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/include/LinearFakeValueGenerator.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/src/LinearFakeValueGenerator.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;