commit 8e92b749f44182da1cced8da67f2a8b276816b1c
author Pavel Maltsev <pavelm@google.com> Fri Mar 10 01:18:48 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 10 01:18:49 2017 +0000
tree 526ca6a77a8beab2f70596c004ba416b9d555795
parent 54b2e5e9c8d65a3c893f4c7c434fc625638cf625
parent 4b0c5abe7640393b7f320f244f4bc97922e0bc1e

Merge "Fix static properties to comply with VTS"

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
index 596ad85..95ca37b 100644
--- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
@@ -176,13 +176,7 @@
     {
         .prop = toInt(VehicleProperty::INFO_FUEL_CAPACITY),
         .access = VehiclePropertyAccess::READ,
-        .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
-        .areaConfigs = {
-            VehicleAreaConfig {
-                .minFloatValue = 0,
-                .maxFloatValue = 1.0
-            }
-        }
+        .changeMode = VehiclePropertyChangeMode::STATIC,
     },
 
     {

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

diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp
index 2214100..808aafb 100644
--- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp
@@ -410,7 +410,7 @@
         prop->value.int32Values[0] = toInt(VehicleGear::GEAR_PARK);
         break;
     case toInt(VehicleProperty::INFO_FUEL_CAPACITY):
-        prop->value.floatValues[0] = 0.75f;
+        prop->value.floatValues[0] = 123000.0f;  // In milliliters
         break;
     case toInt(VehicleProperty::ENGINE_OIL_TEMP):
         prop->value.floatValues[0] = 101;