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

Commit ad2baebb authored by Enrico Granata's avatar Enrico Granata
Browse files

Do not write initial empty values for the diagnostic properties. 

There is a separate step that initializes them with meaningful values.

Change-Id: I2480a029773b62b0e77b8c52c73f2ee465caf17c
Fixes: b/65125128
Test: runtest -x packages/services/Car/tests/android_car_api_test/src/android/car/apitest/CarDiagnosticManagerTest.java
parent 62cc79bd

automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp

+17 −0
Original line number Diff line number Diff line
@@ -162,12 +162,29 @@ StatusCode EmulatedVehicleHal::set(const VehiclePropValue& propValue) { 
    return StatusCode::OK;

}



static bool isDiagnosticProperty(VehiclePropConfig propConfig) {

    switch (propConfig.prop) {

        case OBD2_LIVE_FRAME:

        case OBD2_FREEZE_FRAME:

        case OBD2_FREEZE_FRAME_CLEAR:

        case OBD2_FREEZE_FRAME_INFO:

            return true;

    }

    return false;

}



// Parse supported properties list and generate vector of property values to hold current values.

void EmulatedVehicleHal::onCreate() {

    for (auto& it : kVehicleProperties) {

        VehiclePropConfig cfg = it.config;

        int32_t supportedAreas = cfg.supportedAreas;



        if (isDiagnosticProperty(cfg)) {

            // do not write an initial empty value for the diagnostic properties

            // as we will initialize those separately.

            continue;

        }



        //  A global property will have supportedAreas = 0

        if (isGlobalProp(cfg.prop)) {

            supportedAreas = 0;