CarService changes necessary to support the diagnostic enums rename on the Vehicle HAL side
Test: clean build and flash, then
runtest -x packages/services/Car/tests/android_car_api_test/src/android/car/apitest/CarDiagnosticManagerTest.java
runtest -x packages/services/Car/tests/carservice_test/src/com/android/car/test/CarDiagnosticManagerTest.java
runtest -x packages/services/Car/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/Obd2FreezeFrameTest.java
runtest -x packages/services/Car/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/Obd2LiveFrameTest.java
Bug: 64024685
Change-Id: Ie6615dc84fcddbb108ad1c58b7a569b8e6ce37d6
diff --git a/car-lib/api/system-current.txt b/car-lib/api/system-current.txt
index c23c01c..58abfcb 100644
--- a/car-lib/api/system-current.txt
+++ b/car-lib/api/system-current.txt
@@ -512,13 +512,7 @@
ctor public CarDiagnosticSensorIndices();
}
- public static abstract class CarDiagnosticSensorIndices.FloatSensorIndex implements java.lang.annotation.Annotation {
- }
-
- public static abstract class CarDiagnosticSensorIndices.IntegerSensorIndex implements java.lang.annotation.Annotation {
- }
-
- public static final class CarDiagnosticSensorIndices.Obd2FloatSensorIndex {
+ public static final class CarDiagnosticSensorIndices.FloatSensorIndex {
field public static final int ABSOLUTE_EVAPORATION_SYSTEM_VAPOR_PRESSURE = 58; // 0x3a
field public static final int ABSOLUTE_LOAD_VALUE = 48; // 0x30
field public static final int ABSOLUTE_THROTTLE_POSITION_B = 51; // 0x33
@@ -594,7 +588,7 @@
field public static final int VENDOR_START = 71; // 0x47
}
- public static final class CarDiagnosticSensorIndices.Obd2IntegerSensorIndex {
+ public static final class CarDiagnosticSensorIndices.IntegerSensorIndex {
field public static final int ABSOLUTE_BAROMETRIC_PRESSURE = 11; // 0xb
field public static final int AMBIENT_AIR_TEMPERATURE = 13; // 0xd
field public static final int COMMANDED_SECONDARY_AIR_STATUS = 5; // 0x5
diff --git a/car-lib/src/android/car/hardware/CarDiagnosticEvent.java b/car-lib/src/android/car/hardware/CarDiagnosticEvent.java
index 8ca418f..50a78c8 100644
--- a/car-lib/src/android/car/hardware/CarDiagnosticEvent.java
+++ b/car-lib/src/android/car/hardware/CarDiagnosticEvent.java
@@ -228,13 +228,13 @@
SparseArray<Float> newFloatValues = floatValues.clone();
for (int i = 0; i < intValues.size(); ++i) {
int key = intValues.keyAt(i);
- if (key >= CarDiagnosticSensorIndices.Obd2IntegerSensorIndex.LAST_SYSTEM) {
+ if (key >= CarDiagnosticSensorIndices.IntegerSensorIndex.LAST_SYSTEM) {
newIntValues.delete(key);
}
}
for (int i = 0; i < floatValues.size(); ++i) {
int key = floatValues.keyAt(i);
- if (key >= CarDiagnosticSensorIndices.Obd2FloatSensorIndex.LAST_SYSTEM) {
+ if (key >= CarDiagnosticSensorIndices.FloatSensorIndex.LAST_SYSTEM) {
newFloatValues.delete(key);
}
}
@@ -366,12 +366,12 @@
}
public int getSystemIntegerSensor(
- @CarDiagnosticSensorIndices.IntegerSensorIndex int sensor, int defaultValue) {
+ @CarDiagnosticSensorIndices.DiagnosticIntegerSensorIndex int sensor, int defaultValue) {
return intValues.get(sensor, defaultValue);
}
public float getSystemFloatSensor(
- @CarDiagnosticSensorIndices.FloatSensorIndex int sensor, float defaultValue) {
+ @CarDiagnosticSensorIndices.DiagnosticFloatSensorIndex int sensor, float defaultValue) {
return floatValues.get(sensor, defaultValue);
}
@@ -384,14 +384,14 @@
}
public @Nullable Integer getSystemIntegerSensor(
- @CarDiagnosticSensorIndices.IntegerSensorIndex int sensor) {
+ @CarDiagnosticSensorIndices.DiagnosticIntegerSensorIndex int sensor) {
int index = intValues.indexOfKey(sensor);
if (index < 0) return null;
return intValues.valueAt(index);
}
public @Nullable Float getSystemFloatSensor(
- @CarDiagnosticSensorIndices.FloatSensorIndex int sensor) {
+ @CarDiagnosticSensorIndices.DiagnosticFloatSensorIndex int sensor) {
int index = floatValues.indexOfKey(sensor);
if (index < 0) return null;
return floatValues.valueAt(index);
@@ -411,7 +411,7 @@
/**
* Represents possible states of the fuel system; see {@link
- * CarDiagnosticSensorIndices.Obd2IntegerSensorIndex#FUEL_SYSTEM_STATUS}
+ * CarDiagnosticSensorIndices.IntegerSensorIndex#FUEL_SYSTEM_STATUS}
*/
public static final class FuelSystemStatus {
private FuelSystemStatus() {}
@@ -435,7 +435,7 @@
/**
* Represents possible states of the secondary air system; see {@link
- * CarDiagnosticSensorIndices.Obd2IntegerSensorIndex#COMMANDED_SECONDARY_AIR_STATUS}
+ * CarDiagnosticSensorIndices.IntegerSensorIndex#COMMANDED_SECONDARY_AIR_STATUS}
*/
public static final class SecondaryAirStatus {
private SecondaryAirStatus() {}
@@ -457,7 +457,7 @@
/**
* Represents possible types of fuel; see {@link
- * CarDiagnosticSensorIndices.Obd2IntegerSensorIndex#FUEL_TYPE}
+ * CarDiagnosticSensorIndices.IntegerSensorIndex#FUEL_TYPE}
*/
public static final class FuelType {
private FuelType() {}
@@ -519,8 +519,8 @@
/**
* Represents possible states of the ignition monitors on the vehicle; see {@link
- * CarDiagnosticSensorIndices.Obd2IntegerSensorIndex#IGNITION_MONITORS_SUPPORTED} see {@link
- * CarDiagnosticSensorIndices.Obd2IntegerSensorIndex#IGNITION_SPECIFIC_MONITORS}
+ * CarDiagnosticSensorIndices.IntegerSensorIndex#IGNITION_MONITORS_SUPPORTED} see {@link
+ * CarDiagnosticSensorIndices.IntegerSensorIndex#IGNITION_SPECIFIC_MONITORS}
*/
public static final class IgnitionMonitors {
public static final class IgnitionMonitor {
@@ -727,22 +727,22 @@
public @Nullable @FuelSystemStatus.Status Integer getFuelSystemStatus() {
return getSystemIntegerSensor(
- CarDiagnosticSensorIndices.Obd2IntegerSensorIndex.FUEL_SYSTEM_STATUS);
+ CarDiagnosticSensorIndices.IntegerSensorIndex.FUEL_SYSTEM_STATUS);
}
public @Nullable @SecondaryAirStatus.Status Integer getSecondaryAirStatus() {
return getSystemIntegerSensor(
- CarDiagnosticSensorIndices.Obd2IntegerSensorIndex.COMMANDED_SECONDARY_AIR_STATUS);
+ CarDiagnosticSensorIndices.IntegerSensorIndex.COMMANDED_SECONDARY_AIR_STATUS);
}
public @Nullable IgnitionMonitors.CommonIgnitionMonitors getIgnitionMonitors() {
Integer ignitionMonitorsType =
getSystemIntegerSensor(
- CarDiagnosticSensorIndices.Obd2IntegerSensorIndex
+ CarDiagnosticSensorIndices.IntegerSensorIndex
.IGNITION_MONITORS_SUPPORTED);
Integer ignitionMonitorsBitmask =
getSystemIntegerSensor(
- CarDiagnosticSensorIndices.Obd2IntegerSensorIndex
+ CarDiagnosticSensorIndices.IntegerSensorIndex
.IGNITION_SPECIFIC_MONITORS);
if (null == ignitionMonitorsType) return null;
if (null == ignitionMonitorsBitmask) return null;
@@ -757,6 +757,6 @@
}
public @Nullable @FuelType.Type Integer getFuelType() {
- return getSystemIntegerSensor(CarDiagnosticSensorIndices.Obd2IntegerSensorIndex.FUEL_TYPE);
+ return getSystemIntegerSensor(CarDiagnosticSensorIndices.IntegerSensorIndex.FUEL_TYPE);
}
}
diff --git a/car-lib/src/android/car/hardware/CarDiagnosticSensorIndices.java b/car-lib/src/android/car/hardware/CarDiagnosticSensorIndices.java
index 12ff423..5d19fca 100644
--- a/car-lib/src/android/car/hardware/CarDiagnosticSensorIndices.java
+++ b/car-lib/src/android/car/hardware/CarDiagnosticSensorIndices.java
@@ -31,8 +31,8 @@
*/
@SystemApi
public final class CarDiagnosticSensorIndices {
- public static final class Obd2IntegerSensorIndex {
- private Obd2IntegerSensorIndex() {}
+ public static final class IntegerSensorIndex {
+ private IntegerSensorIndex() {}
public static final int FUEL_SYSTEM_STATUS = 0;
public static final int MALFUNCTION_INDICATOR_LIGHT_ON = 1;
@@ -70,8 +70,8 @@
public static final int VENDOR_START = LAST_SYSTEM + 1;
}
- public static final class Obd2FloatSensorIndex {
- private Obd2FloatSensorIndex() {}
+ public static final class FloatSensorIndex {
+ private FloatSensorIndex() {}
public static final int CALCULATED_ENGINE_LOAD = 0;
public static final int ENGINE_COOLANT_TEMPERATURE = 1;
@@ -148,121 +148,123 @@
public static final int VENDOR_START = LAST_SYSTEM + 1;
}
+ /** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef({
- Obd2IntegerSensorIndex.FUEL_SYSTEM_STATUS,
- Obd2IntegerSensorIndex.MALFUNCTION_INDICATOR_LIGHT_ON,
- Obd2IntegerSensorIndex.IGNITION_MONITORS_SUPPORTED,
- Obd2IntegerSensorIndex.IGNITION_SPECIFIC_MONITORS,
- Obd2IntegerSensorIndex.INTAKE_AIR_TEMPERATURE,
- Obd2IntegerSensorIndex.COMMANDED_SECONDARY_AIR_STATUS,
- Obd2IntegerSensorIndex.NUM_OXYGEN_SENSORS_PRESENT,
- Obd2IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START,
- Obd2IntegerSensorIndex.DISTANCE_TRAVELED_WITH_MALFUNCTION_INDICATOR_LIGHT_ON,
- Obd2IntegerSensorIndex.WARMUPS_SINCE_CODES_CLEARED,
- Obd2IntegerSensorIndex.DISTANCE_TRAVELED_SINCE_CODES_CLEARED,
- Obd2IntegerSensorIndex.ABSOLUTE_BAROMETRIC_PRESSURE,
- Obd2IntegerSensorIndex.CONTROL_MODULE_VOLTAGE,
- Obd2IntegerSensorIndex.AMBIENT_AIR_TEMPERATURE,
- Obd2IntegerSensorIndex.TIME_WITH_MALFUNCTION_LIGHT_ON,
- Obd2IntegerSensorIndex.TIME_SINCE_TROUBLE_CODES_CLEARED,
- Obd2IntegerSensorIndex.MAX_FUEL_AIR_EQUIVALENCE_RATIO,
- Obd2IntegerSensorIndex.MAX_OXYGEN_SENSOR_VOLTAGE,
- Obd2IntegerSensorIndex.MAX_OXYGEN_SENSOR_CURRENT,
- Obd2IntegerSensorIndex.MAX_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE,
- Obd2IntegerSensorIndex.MAX_AIR_FLOW_RATE_FROM_MASS_AIR_FLOW_SENSOR,
- Obd2IntegerSensorIndex.FUEL_TYPE,
- Obd2IntegerSensorIndex.FUEL_RAIL_ABSOLUTE_PRESSURE,
- Obd2IntegerSensorIndex.ENGINE_OIL_TEMPERATURE,
- Obd2IntegerSensorIndex.DRIVER_DEMAND_PERCENT_TORQUE,
- Obd2IntegerSensorIndex.ENGINE_ACTUAL_PERCENT_TORQUE,
- Obd2IntegerSensorIndex.ENGINE_REFERENCE_PERCENT_TORQUE,
- Obd2IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_IDLE,
- Obd2IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT1,
- Obd2IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT2,
- Obd2IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT3,
- Obd2IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT4,
- Obd2IntegerSensorIndex.LAST_SYSTEM,
- Obd2IntegerSensorIndex.VENDOR_START,
+ IntegerSensorIndex.FUEL_SYSTEM_STATUS,
+ IntegerSensorIndex.MALFUNCTION_INDICATOR_LIGHT_ON,
+ IntegerSensorIndex.IGNITION_MONITORS_SUPPORTED,
+ IntegerSensorIndex.IGNITION_SPECIFIC_MONITORS,
+ IntegerSensorIndex.INTAKE_AIR_TEMPERATURE,
+ IntegerSensorIndex.COMMANDED_SECONDARY_AIR_STATUS,
+ IntegerSensorIndex.NUM_OXYGEN_SENSORS_PRESENT,
+ IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START,
+ IntegerSensorIndex.DISTANCE_TRAVELED_WITH_MALFUNCTION_INDICATOR_LIGHT_ON,
+ IntegerSensorIndex.WARMUPS_SINCE_CODES_CLEARED,
+ IntegerSensorIndex.DISTANCE_TRAVELED_SINCE_CODES_CLEARED,
+ IntegerSensorIndex.ABSOLUTE_BAROMETRIC_PRESSURE,
+ IntegerSensorIndex.CONTROL_MODULE_VOLTAGE,
+ IntegerSensorIndex.AMBIENT_AIR_TEMPERATURE,
+ IntegerSensorIndex.TIME_WITH_MALFUNCTION_LIGHT_ON,
+ IntegerSensorIndex.TIME_SINCE_TROUBLE_CODES_CLEARED,
+ IntegerSensorIndex.MAX_FUEL_AIR_EQUIVALENCE_RATIO,
+ IntegerSensorIndex.MAX_OXYGEN_SENSOR_VOLTAGE,
+ IntegerSensorIndex.MAX_OXYGEN_SENSOR_CURRENT,
+ IntegerSensorIndex.MAX_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE,
+ IntegerSensorIndex.MAX_AIR_FLOW_RATE_FROM_MASS_AIR_FLOW_SENSOR,
+ IntegerSensorIndex.FUEL_TYPE,
+ IntegerSensorIndex.FUEL_RAIL_ABSOLUTE_PRESSURE,
+ IntegerSensorIndex.ENGINE_OIL_TEMPERATURE,
+ IntegerSensorIndex.DRIVER_DEMAND_PERCENT_TORQUE,
+ IntegerSensorIndex.ENGINE_ACTUAL_PERCENT_TORQUE,
+ IntegerSensorIndex.ENGINE_REFERENCE_PERCENT_TORQUE,
+ IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_IDLE,
+ IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT1,
+ IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT2,
+ IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT3,
+ IntegerSensorIndex.ENGINE_PERCENT_TORQUE_DATA_POINT4,
+ IntegerSensorIndex.LAST_SYSTEM,
+ IntegerSensorIndex.VENDOR_START,
})
- public @interface IntegerSensorIndex {}
+ public @interface DiagnosticIntegerSensorIndex {}
+ /** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef({
- Obd2FloatSensorIndex.CALCULATED_ENGINE_LOAD,
- Obd2FloatSensorIndex.ENGINE_COOLANT_TEMPERATURE,
- Obd2FloatSensorIndex.SHORT_TERM_FUEL_TRIM_BANK1,
- Obd2FloatSensorIndex.LONG_TERM_FUEL_TRIM_BANK1,
- Obd2FloatSensorIndex.SHORT_TERM_FUEL_TRIM_BANK2,
- Obd2FloatSensorIndex.LONG_TERM_FUEL_TRIM_BANK2,
- Obd2FloatSensorIndex.FUEL_PRESSURE,
- Obd2FloatSensorIndex.INTAKE_MANIFOLD_ABSOLUTE_PRESSURE,
- Obd2FloatSensorIndex.ENGINE_RPM,
- Obd2FloatSensorIndex.VEHICLE_SPEED,
- Obd2FloatSensorIndex.TIMING_ADVANCE,
- Obd2FloatSensorIndex.MAF_AIR_FLOW_RATE,
- Obd2FloatSensorIndex.THROTTLE_POSITION,
- Obd2FloatSensorIndex.OXYGEN_SENSOR1_VOLTAGE,
- Obd2FloatSensorIndex.OXYGEN_SENSOR1_SHORT_TERM_FUEL_TRIM,
- Obd2FloatSensorIndex.OXYGEN_SENSOR1_FUEL_AIR_EQUIVALENCE_RATIO,
- Obd2FloatSensorIndex.OXYGEN_SENSOR2_VOLTAGE,
- Obd2FloatSensorIndex.OXYGEN_SENSOR2_SHORT_TERM_FUEL_TRIM,
- Obd2FloatSensorIndex.OXYGEN_SENSOR2_FUEL_AIR_EQUIVALENCE_RATIO,
- Obd2FloatSensorIndex.OXYGEN_SENSOR3_VOLTAGE,
- Obd2FloatSensorIndex.OXYGEN_SENSOR3_SHORT_TERM_FUEL_TRIM,
- Obd2FloatSensorIndex.OXYGEN_SENSOR3_FUEL_AIR_EQUIVALENCE_RATIO,
- Obd2FloatSensorIndex.OXYGEN_SENSOR4_VOLTAGE,
- Obd2FloatSensorIndex.OXYGEN_SENSOR4_SHORT_TERM_FUEL_TRIM,
- Obd2FloatSensorIndex.OXYGEN_SENSOR4_FUEL_AIR_EQUIVALENCE_RATIO,
- Obd2FloatSensorIndex.OXYGEN_SENSOR5_VOLTAGE,
- Obd2FloatSensorIndex.OXYGEN_SENSOR5_SHORT_TERM_FUEL_TRIM,
- Obd2FloatSensorIndex.OXYGEN_SENSOR5_FUEL_AIR_EQUIVALENCE_RATIO,
- Obd2FloatSensorIndex.OXYGEN_SENSOR6_VOLTAGE,
- Obd2FloatSensorIndex.OXYGEN_SENSOR6_SHORT_TERM_FUEL_TRIM,
- Obd2FloatSensorIndex.OXYGEN_SENSOR6_FUEL_AIR_EQUIVALENCE_RATIO,
- Obd2FloatSensorIndex.OXYGEN_SENSOR7_VOLTAGE,
- Obd2FloatSensorIndex.OXYGEN_SENSOR7_SHORT_TERM_FUEL_TRIM,
- Obd2FloatSensorIndex.OXYGEN_SENSOR7_FUEL_AIR_EQUIVALENCE_RATIO,
- Obd2FloatSensorIndex.OXYGEN_SENSOR8_VOLTAGE,
- Obd2FloatSensorIndex.OXYGEN_SENSOR8_SHORT_TERM_FUEL_TRIM,
- Obd2FloatSensorIndex.OXYGEN_SENSOR8_FUEL_AIR_EQUIVALENCE_RATIO,
- Obd2FloatSensorIndex.FUEL_RAIL_PRESSURE,
- Obd2FloatSensorIndex.FUEL_RAIL_GAUGE_PRESSURE,
- Obd2FloatSensorIndex.COMMANDED_EXHAUST_GAS_RECIRCULATION,
- Obd2FloatSensorIndex.EXHAUST_GAS_RECIRCULATION_ERROR,
- Obd2FloatSensorIndex.COMMANDED_EVAPORATIVE_PURGE,
- Obd2FloatSensorIndex.FUEL_TANK_LEVEL_INPUT,
- Obd2FloatSensorIndex.EVAPORATION_SYSTEM_VAPOR_PRESSURE,
- Obd2FloatSensorIndex.CATALYST_TEMPERATURE_BANK1_SENSOR1,
- Obd2FloatSensorIndex.CATALYST_TEMPERATURE_BANK2_SENSOR1,
- Obd2FloatSensorIndex.CATALYST_TEMPERATURE_BANK1_SENSOR2,
- Obd2FloatSensorIndex.CATALYST_TEMPERATURE_BANK2_SENSOR2,
- Obd2FloatSensorIndex.ABSOLUTE_LOAD_VALUE,
- Obd2FloatSensorIndex.FUEL_AIR_COMMANDED_EQUIVALENCE_RATIO,
- Obd2FloatSensorIndex.RELATIVE_THROTTLE_POSITION,
- Obd2FloatSensorIndex.ABSOLUTE_THROTTLE_POSITION_B,
- Obd2FloatSensorIndex.ABSOLUTE_THROTTLE_POSITION_C,
- Obd2FloatSensorIndex.ACCELERATOR_PEDAL_POSITION_D,
- Obd2FloatSensorIndex.ACCELERATOR_PEDAL_POSITION_E,
- Obd2FloatSensorIndex.ACCELERATOR_PEDAL_POSITION_F,
- Obd2FloatSensorIndex.COMMANDED_THROTTLE_ACTUATOR,
- Obd2FloatSensorIndex.ETHANOL_FUEL_PERCENTAGE,
- Obd2FloatSensorIndex.ABSOLUTE_EVAPORATION_SYSTEM_VAPOR_PRESSURE,
- Obd2FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK1,
- Obd2FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK2,
- Obd2FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK3,
- Obd2FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK4,
- Obd2FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK1,
- Obd2FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK2,
- Obd2FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK3,
- Obd2FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK4,
- Obd2FloatSensorIndex.RELATIVE_ACCELERATOR_PEDAL_POSITION,
- Obd2FloatSensorIndex.HYBRID_BATTERY_PACK_REMAINING_LIFE,
- Obd2FloatSensorIndex.FUEL_INJECTION_TIMING,
- Obd2FloatSensorIndex.ENGINE_FUEL_RATE,
- Obd2FloatSensorIndex.LAST_SYSTEM,
- Obd2FloatSensorIndex.VENDOR_START,
+ FloatSensorIndex.CALCULATED_ENGINE_LOAD,
+ FloatSensorIndex.ENGINE_COOLANT_TEMPERATURE,
+ FloatSensorIndex.SHORT_TERM_FUEL_TRIM_BANK1,
+ FloatSensorIndex.LONG_TERM_FUEL_TRIM_BANK1,
+ FloatSensorIndex.SHORT_TERM_FUEL_TRIM_BANK2,
+ FloatSensorIndex.LONG_TERM_FUEL_TRIM_BANK2,
+ FloatSensorIndex.FUEL_PRESSURE,
+ FloatSensorIndex.INTAKE_MANIFOLD_ABSOLUTE_PRESSURE,
+ FloatSensorIndex.ENGINE_RPM,
+ FloatSensorIndex.VEHICLE_SPEED,
+ FloatSensorIndex.TIMING_ADVANCE,
+ FloatSensorIndex.MAF_AIR_FLOW_RATE,
+ FloatSensorIndex.THROTTLE_POSITION,
+ FloatSensorIndex.OXYGEN_SENSOR1_VOLTAGE,
+ FloatSensorIndex.OXYGEN_SENSOR1_SHORT_TERM_FUEL_TRIM,
+ FloatSensorIndex.OXYGEN_SENSOR1_FUEL_AIR_EQUIVALENCE_RATIO,
+ FloatSensorIndex.OXYGEN_SENSOR2_VOLTAGE,
+ FloatSensorIndex.OXYGEN_SENSOR2_SHORT_TERM_FUEL_TRIM,
+ FloatSensorIndex.OXYGEN_SENSOR2_FUEL_AIR_EQUIVALENCE_RATIO,
+ FloatSensorIndex.OXYGEN_SENSOR3_VOLTAGE,
+ FloatSensorIndex.OXYGEN_SENSOR3_SHORT_TERM_FUEL_TRIM,
+ FloatSensorIndex.OXYGEN_SENSOR3_FUEL_AIR_EQUIVALENCE_RATIO,
+ FloatSensorIndex.OXYGEN_SENSOR4_VOLTAGE,
+ FloatSensorIndex.OXYGEN_SENSOR4_SHORT_TERM_FUEL_TRIM,
+ FloatSensorIndex.OXYGEN_SENSOR4_FUEL_AIR_EQUIVALENCE_RATIO,
+ FloatSensorIndex.OXYGEN_SENSOR5_VOLTAGE,
+ FloatSensorIndex.OXYGEN_SENSOR5_SHORT_TERM_FUEL_TRIM,
+ FloatSensorIndex.OXYGEN_SENSOR5_FUEL_AIR_EQUIVALENCE_RATIO,
+ FloatSensorIndex.OXYGEN_SENSOR6_VOLTAGE,
+ FloatSensorIndex.OXYGEN_SENSOR6_SHORT_TERM_FUEL_TRIM,
+ FloatSensorIndex.OXYGEN_SENSOR6_FUEL_AIR_EQUIVALENCE_RATIO,
+ FloatSensorIndex.OXYGEN_SENSOR7_VOLTAGE,
+ FloatSensorIndex.OXYGEN_SENSOR7_SHORT_TERM_FUEL_TRIM,
+ FloatSensorIndex.OXYGEN_SENSOR7_FUEL_AIR_EQUIVALENCE_RATIO,
+ FloatSensorIndex.OXYGEN_SENSOR8_VOLTAGE,
+ FloatSensorIndex.OXYGEN_SENSOR8_SHORT_TERM_FUEL_TRIM,
+ FloatSensorIndex.OXYGEN_SENSOR8_FUEL_AIR_EQUIVALENCE_RATIO,
+ FloatSensorIndex.FUEL_RAIL_PRESSURE,
+ FloatSensorIndex.FUEL_RAIL_GAUGE_PRESSURE,
+ FloatSensorIndex.COMMANDED_EXHAUST_GAS_RECIRCULATION,
+ FloatSensorIndex.EXHAUST_GAS_RECIRCULATION_ERROR,
+ FloatSensorIndex.COMMANDED_EVAPORATIVE_PURGE,
+ FloatSensorIndex.FUEL_TANK_LEVEL_INPUT,
+ FloatSensorIndex.EVAPORATION_SYSTEM_VAPOR_PRESSURE,
+ FloatSensorIndex.CATALYST_TEMPERATURE_BANK1_SENSOR1,
+ FloatSensorIndex.CATALYST_TEMPERATURE_BANK2_SENSOR1,
+ FloatSensorIndex.CATALYST_TEMPERATURE_BANK1_SENSOR2,
+ FloatSensorIndex.CATALYST_TEMPERATURE_BANK2_SENSOR2,
+ FloatSensorIndex.ABSOLUTE_LOAD_VALUE,
+ FloatSensorIndex.FUEL_AIR_COMMANDED_EQUIVALENCE_RATIO,
+ FloatSensorIndex.RELATIVE_THROTTLE_POSITION,
+ FloatSensorIndex.ABSOLUTE_THROTTLE_POSITION_B,
+ FloatSensorIndex.ABSOLUTE_THROTTLE_POSITION_C,
+ FloatSensorIndex.ACCELERATOR_PEDAL_POSITION_D,
+ FloatSensorIndex.ACCELERATOR_PEDAL_POSITION_E,
+ FloatSensorIndex.ACCELERATOR_PEDAL_POSITION_F,
+ FloatSensorIndex.COMMANDED_THROTTLE_ACTUATOR,
+ FloatSensorIndex.ETHANOL_FUEL_PERCENTAGE,
+ FloatSensorIndex.ABSOLUTE_EVAPORATION_SYSTEM_VAPOR_PRESSURE,
+ FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK1,
+ FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK2,
+ FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK3,
+ FloatSensorIndex.SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK4,
+ FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK1,
+ FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK2,
+ FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK3,
+ FloatSensorIndex.LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK4,
+ FloatSensorIndex.RELATIVE_ACCELERATOR_PEDAL_POSITION,
+ FloatSensorIndex.HYBRID_BATTERY_PACK_REMAINING_LIFE,
+ FloatSensorIndex.FUEL_INJECTION_TIMING,
+ FloatSensorIndex.ENGINE_FUEL_RATE,
+ FloatSensorIndex.LAST_SYSTEM,
+ FloatSensorIndex.VENDOR_START,
})
- public @interface FloatSensorIndex {}
+ public @interface DiagnosticFloatSensorIndex {}
}
diff --git a/service/src/com/android/car/hal/DiagnosticHalService.java b/service/src/com/android/car/hal/DiagnosticHalService.java
index 85b2ade..4380032 100644
--- a/service/src/com/android/car/hal/DiagnosticHalService.java
+++ b/service/src/com/android/car/hal/DiagnosticHalService.java
@@ -24,8 +24,8 @@
import android.hardware.automotive.vehicle.V2_0.VehiclePropConfig;
import android.hardware.automotive.vehicle.V2_0.VehiclePropValue;
import android.hardware.automotive.vehicle.V2_0.VehiclePropertyChangeMode;
-import android.hardware.automotive.vehicle.V2_1.Obd2FloatSensorIndex;
-import android.hardware.automotive.vehicle.V2_1.Obd2IntegerSensorIndex;
+import android.hardware.automotive.vehicle.V2_1.DiagnosticFloatSensorIndex;
+import android.hardware.automotive.vehicle.V2_1.DiagnosticIntegerSensorIndex;
import android.hardware.automotive.vehicle.V2_1.VehicleProperty;
import android.util.Log;
import android.util.SparseArray;
@@ -128,7 +128,7 @@
}
private int getNumIntegerSensors(int halPropId) {
- int count = Obd2IntegerSensorIndex.LAST_SYSTEM_INDEX + 1;
+ int count = DiagnosticIntegerSensorIndex.LAST_SYSTEM_INDEX + 1;
List<Integer> configArray = getPropConfigArray(halPropId);
if(configArray.size() < 2) {
Log.e(CarLog.TAG_DIAGNOSTIC, String.format(
@@ -142,7 +142,7 @@
}
private int getNumFloatSensors(int halPropId) {
- int count = Obd2FloatSensorIndex.LAST_SYSTEM_INDEX + 1;
+ int count = DiagnosticFloatSensorIndex.LAST_SYSTEM_INDEX + 1;
List<Integer> configArray = getPropConfigArray(halPropId);
if(configArray.size() < 2) {
Log.e(CarLog.TAG_DIAGNOSTIC, String.format(
diff --git a/tests/carservice_test/src/com/android/car/test/CarDiagnosticManagerTest.java b/tests/carservice_test/src/com/android/car/test/CarDiagnosticManagerTest.java
index d316ba6..6dc4784 100644
--- a/tests/carservice_test/src/com/android/car/test/CarDiagnosticManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/test/CarDiagnosticManagerTest.java
@@ -27,8 +27,8 @@
import android.car.hardware.CarDiagnosticEvent.IgnitionMonitors.SparkIgnitionMonitors;
import android.car.hardware.CarDiagnosticEvent.SecondaryAirStatus;
import android.car.hardware.CarDiagnosticManager;
-import android.car.hardware.CarDiagnosticSensorIndices.Obd2FloatSensorIndex;
-import android.car.hardware.CarDiagnosticSensorIndices.Obd2IntegerSensorIndex;
+import android.car.hardware.CarDiagnosticSensorIndices.FloatSensorIndex;
+import android.car.hardware.CarDiagnosticSensorIndices.IntegerSensorIndex;
import android.hardware.automotive.vehicle.V2_0.VehiclePropValue;
import android.hardware.automotive.vehicle.V2_1.VehicleProperty;
import android.os.SystemClock;
@@ -205,23 +205,23 @@
@Override
protected void setUp() throws Exception {
- mLiveFrameEventBuilder.addIntSensor(Obd2IntegerSensorIndex.AMBIENT_AIR_TEMPERATURE, 30);
+ mLiveFrameEventBuilder.addIntSensor(IntegerSensorIndex.AMBIENT_AIR_TEMPERATURE, 30);
mLiveFrameEventBuilder.addIntSensor(
- Obd2IntegerSensorIndex.FUEL_SYSTEM_STATUS,
+ IntegerSensorIndex.FUEL_SYSTEM_STATUS,
FuelSystemStatus.OPEN_ENGINE_LOAD_OR_DECELERATION);
mLiveFrameEventBuilder.addIntSensor(
- Obd2IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START, 5000);
- mLiveFrameEventBuilder.addIntSensor(Obd2IntegerSensorIndex.CONTROL_MODULE_VOLTAGE, 2);
- mLiveFrameEventBuilder.addFloatSensor(Obd2FloatSensorIndex.CALCULATED_ENGINE_LOAD, 0.125f);
- mLiveFrameEventBuilder.addFloatSensor(Obd2FloatSensorIndex.VEHICLE_SPEED, 12.5f);
+ IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START, 5000);
+ mLiveFrameEventBuilder.addIntSensor(IntegerSensorIndex.CONTROL_MODULE_VOLTAGE, 2);
+ mLiveFrameEventBuilder.addFloatSensor(FloatSensorIndex.CALCULATED_ENGINE_LOAD, 0.125f);
+ mLiveFrameEventBuilder.addFloatSensor(FloatSensorIndex.VEHICLE_SPEED, 12.5f);
- mFreezeFrameEventBuilder.addIntSensor(Obd2IntegerSensorIndex.AMBIENT_AIR_TEMPERATURE, 30);
+ mFreezeFrameEventBuilder.addIntSensor(IntegerSensorIndex.AMBIENT_AIR_TEMPERATURE, 30);
mFreezeFrameEventBuilder.addIntSensor(
- Obd2IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START, 5000);
- mFreezeFrameEventBuilder.addIntSensor(Obd2IntegerSensorIndex.CONTROL_MODULE_VOLTAGE, 2);
+ IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START, 5000);
+ mFreezeFrameEventBuilder.addIntSensor(IntegerSensorIndex.CONTROL_MODULE_VOLTAGE, 2);
mFreezeFrameEventBuilder.addFloatSensor(
- Obd2FloatSensorIndex.CALCULATED_ENGINE_LOAD, 0.125f);
- mFreezeFrameEventBuilder.addFloatSensor(Obd2FloatSensorIndex.VEHICLE_SPEED, 12.5f);
+ FloatSensorIndex.CALCULATED_ENGINE_LOAD, 0.125f);
+ mFreezeFrameEventBuilder.addFloatSensor(FloatSensorIndex.VEHICLE_SPEED, 12.5f);
mFreezeFrameEventBuilder.setDTC(DTC);
super.setUp();
@@ -242,26 +242,26 @@
assertEquals(
5000,
liveFrame
- .getSystemIntegerSensor(Obd2IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START)
+ .getSystemIntegerSensor(IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START)
.intValue());
assertEquals(
30,
liveFrame
- .getSystemIntegerSensor(Obd2IntegerSensorIndex.AMBIENT_AIR_TEMPERATURE)
+ .getSystemIntegerSensor(IntegerSensorIndex.AMBIENT_AIR_TEMPERATURE)
.intValue());
assertEquals(
2,
liveFrame
- .getSystemIntegerSensor(Obd2IntegerSensorIndex.CONTROL_MODULE_VOLTAGE)
+ .getSystemIntegerSensor(IntegerSensorIndex.CONTROL_MODULE_VOLTAGE)
.intValue());
assertEquals(
0.125f,
liveFrame
- .getSystemFloatSensor(Obd2FloatSensorIndex.CALCULATED_ENGINE_LOAD)
+ .getSystemFloatSensor(FloatSensorIndex.CALCULATED_ENGINE_LOAD)
.floatValue());
assertEquals(
12.5f,
- liveFrame.getSystemFloatSensor(Obd2FloatSensorIndex.VEHICLE_SPEED).floatValue());
+ liveFrame.getSystemFloatSensor(FloatSensorIndex.VEHICLE_SPEED).floatValue());
}
public void testLiveFrameEvent() throws Exception {
@@ -274,7 +274,7 @@
listener.reset();
long time = SystemClock.elapsedRealtimeNanos();
mLiveFrameEventBuilder.addIntSensor(
- Obd2IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START, 5100);
+ IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START, 5100);
getMockedVehicleHal().injectEvent(mLiveFrameEventBuilder.build(time));
assertTrue(listener.waitForEvent(time));
@@ -284,7 +284,7 @@
assertEquals(
5100,
liveFrame
- .getSystemIntegerSensor(Obd2IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START)
+ .getSystemIntegerSensor(IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START)
.intValue());
}
@@ -303,23 +303,23 @@
assertNull(
liveFrame.getSystemIntegerSensor(
- Obd2IntegerSensorIndex.DRIVER_DEMAND_PERCENT_TORQUE));
+ IntegerSensorIndex.DRIVER_DEMAND_PERCENT_TORQUE));
assertEquals(
-1,
liveFrame.getSystemIntegerSensor(
- Obd2IntegerSensorIndex.DRIVER_DEMAND_PERCENT_TORQUE, -1));
+ IntegerSensorIndex.DRIVER_DEMAND_PERCENT_TORQUE, -1));
- assertNull(liveFrame.getSystemFloatSensor(Obd2FloatSensorIndex.OXYGEN_SENSOR6_VOLTAGE));
+ assertNull(liveFrame.getSystemFloatSensor(FloatSensorIndex.OXYGEN_SENSOR6_VOLTAGE));
assertEquals(
0.25f,
- liveFrame.getSystemFloatSensor(Obd2FloatSensorIndex.OXYGEN_SENSOR5_VOLTAGE, 0.25f));
+ liveFrame.getSystemFloatSensor(FloatSensorIndex.OXYGEN_SENSOR5_VOLTAGE, 0.25f));
- assertNull(liveFrame.getVendorIntegerSensor(Obd2IntegerSensorIndex.VENDOR_START));
- assertEquals(-1, liveFrame.getVendorIntegerSensor(Obd2IntegerSensorIndex.VENDOR_START, -1));
+ assertNull(liveFrame.getVendorIntegerSensor(IntegerSensorIndex.VENDOR_START));
+ assertEquals(-1, liveFrame.getVendorIntegerSensor(IntegerSensorIndex.VENDOR_START, -1));
- assertNull(liveFrame.getVendorFloatSensor(Obd2FloatSensorIndex.VENDOR_START));
+ assertNull(liveFrame.getVendorFloatSensor(FloatSensorIndex.VENDOR_START));
assertEquals(
- 0.25f, liveFrame.getVendorFloatSensor(Obd2FloatSensorIndex.VENDOR_START, 0.25f));
+ 0.25f, liveFrame.getVendorFloatSensor(FloatSensorIndex.VENDOR_START, 0.25f));
}
public void testFuelSystemStatus() throws Exception {
@@ -338,7 +338,7 @@
assertEquals(
FuelSystemStatus.OPEN_ENGINE_LOAD_OR_DECELERATION,
liveFrame
- .getSystemIntegerSensor(Obd2IntegerSensorIndex.FUEL_SYSTEM_STATUS)
+ .getSystemIntegerSensor(IntegerSensorIndex.FUEL_SYSTEM_STATUS)
.intValue());
assertEquals(
FuelSystemStatus.OPEN_ENGINE_LOAD_OR_DECELERATION,
@@ -353,7 +353,7 @@
android.car.hardware.CarSensorManager.SENSOR_RATE_NORMAL);
mLiveFrameEventBuilder.addIntSensor(
- Obd2IntegerSensorIndex.COMMANDED_SECONDARY_AIR_STATUS,
+ IntegerSensorIndex.COMMANDED_SECONDARY_AIR_STATUS,
SecondaryAirStatus.FROM_OUTSIDE_OR_OFF);
long timestamp = SystemClock.elapsedRealtimeNanos();
getMockedVehicleHal().injectEvent(mLiveFrameEventBuilder.build(timestamp));
@@ -367,7 +367,7 @@
SecondaryAirStatus.FROM_OUTSIDE_OR_OFF,
liveFrame
.getSystemIntegerSensor(
- Obd2IntegerSensorIndex.COMMANDED_SECONDARY_AIR_STATUS)
+ IntegerSensorIndex.COMMANDED_SECONDARY_AIR_STATUS)
.intValue());
assertEquals(
SecondaryAirStatus.FROM_OUTSIDE_OR_OFF,
@@ -388,9 +388,9 @@
final int compressionMonitorsValue =
(0x1 << 2) | (0x1 << 3) | (0x1 << 6) | (0x1 << 12) | (0x1 << 13);
- mLiveFrameEventBuilder.addIntSensor(Obd2IntegerSensorIndex.IGNITION_MONITORS_SUPPORTED, 0);
+ mLiveFrameEventBuilder.addIntSensor(IntegerSensorIndex.IGNITION_MONITORS_SUPPORTED, 0);
mLiveFrameEventBuilder.addIntSensor(
- Obd2IntegerSensorIndex.IGNITION_SPECIFIC_MONITORS, sparkMonitorsValue);
+ IntegerSensorIndex.IGNITION_SPECIFIC_MONITORS, sparkMonitorsValue);
long timestamp = SystemClock.elapsedRealtimeNanos();
getMockedVehicleHal().injectEvent(mLiveFrameEventBuilder.build(timestamp));
@@ -431,9 +431,9 @@
assertFalse(sparkIgnitionMonitors.catalyst.available);
assertFalse(sparkIgnitionMonitors.catalyst.incomplete);
- mLiveFrameEventBuilder.addIntSensor(Obd2IntegerSensorIndex.IGNITION_MONITORS_SUPPORTED, 1);
+ mLiveFrameEventBuilder.addIntSensor(IntegerSensorIndex.IGNITION_MONITORS_SUPPORTED, 1);
mLiveFrameEventBuilder.addIntSensor(
- Obd2IntegerSensorIndex.IGNITION_SPECIFIC_MONITORS, compressionMonitorsValue);
+ IntegerSensorIndex.IGNITION_SPECIFIC_MONITORS, compressionMonitorsValue);
timestamp += 1000;
getMockedVehicleHal().injectEvent(mLiveFrameEventBuilder.build(timestamp));
@@ -479,7 +479,7 @@
android.car.hardware.CarSensorManager.SENSOR_RATE_NORMAL);
mLiveFrameEventBuilder.addIntSensor(
- Obd2IntegerSensorIndex.FUEL_TYPE, FuelType.BIFUEL_RUNNING_LPG);
+ IntegerSensorIndex.FUEL_TYPE, FuelType.BIFUEL_RUNNING_LPG);
long timestamp = SystemClock.elapsedRealtimeNanos();
getMockedVehicleHal().injectEvent(mLiveFrameEventBuilder.build(timestamp));
@@ -490,7 +490,7 @@
assertEquals(
FuelType.BIFUEL_RUNNING_LPG,
- liveFrame.getSystemIntegerSensor(Obd2IntegerSensorIndex.FUEL_TYPE).intValue());
+ liveFrame.getSystemIntegerSensor(IntegerSensorIndex.FUEL_TYPE).intValue());
assertEquals(FuelType.BIFUEL_RUNNING_LPG, liveFrame.getFuelType().intValue());
}
@@ -501,8 +501,8 @@
CarDiagnosticManager.FRAME_TYPE_LIVE,
android.car.hardware.CarSensorManager.SENSOR_RATE_NORMAL);
- mLiveFrameEventBuilder.addIntSensor(Obd2IntegerSensorIndex.ENGINE_OIL_TEMPERATURE, 74);
- mLiveFrameEventBuilder.addFloatSensor(Obd2FloatSensorIndex.OXYGEN_SENSOR1_VOLTAGE, 0.125f);
+ mLiveFrameEventBuilder.addIntSensor(IntegerSensorIndex.ENGINE_OIL_TEMPERATURE, 74);
+ mLiveFrameEventBuilder.addFloatSensor(FloatSensorIndex.OXYGEN_SENSOR1_VOLTAGE, 0.125f);
long timestamp = SystemClock.elapsedRealtimeNanos();
getMockedVehicleHal().injectEvent(mLiveFrameEventBuilder.build(timestamp));
@@ -515,11 +515,11 @@
assertEquals(
74,
liveFrame
- .getSystemIntegerSensor(Obd2IntegerSensorIndex.ENGINE_OIL_TEMPERATURE)
+ .getSystemIntegerSensor(IntegerSensorIndex.ENGINE_OIL_TEMPERATURE)
.intValue());
assertEquals(
0.125f,
- liveFrame.getSystemFloatSensor(Obd2FloatSensorIndex.OXYGEN_SENSOR1_VOLTAGE));
+ liveFrame.getSystemFloatSensor(FloatSensorIndex.OXYGEN_SENSOR1_VOLTAGE));
StringWriter stringWriter = new StringWriter();
JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -535,11 +535,11 @@
74,
diagnosticJson
.intValues
- .get(Obd2IntegerSensorIndex.ENGINE_OIL_TEMPERATURE)
+ .get(IntegerSensorIndex.ENGINE_OIL_TEMPERATURE)
.intValue());
assertEquals(
0.125f,
- diagnosticJson.floatValues.get(Obd2FloatSensorIndex.OXYGEN_SENSOR1_VOLTAGE));
+ diagnosticJson.floatValues.get(FloatSensorIndex.OXYGEN_SENSOR1_VOLTAGE));
}
public void testMultipleListeners() throws Exception {
@@ -576,11 +576,11 @@
assertEquals(
5000,
- event1.getSystemIntegerSensor(Obd2IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START)
+ event1.getSystemIntegerSensor(IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START)
.intValue());
assertEquals(
5000,
- event2.getSystemIntegerSensor(Obd2IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START)
+ event2.getSystemIntegerSensor(IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START)
.intValue());
listener1.reset();
@@ -602,7 +602,7 @@
assertEquals(
5000,
- event2.getSystemIntegerSensor(Obd2IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START)
+ event2.getSystemIntegerSensor(IntegerSensorIndex.RUNTIME_SINCE_ENGINE_START)
.intValue());
}
@@ -624,7 +624,7 @@
assertEquals(DTC, freezeFrame.dtc);
mFreezeFrameEventBuilder.addIntSensor(
- Obd2IntegerSensorIndex.ABSOLUTE_BAROMETRIC_PRESSURE, 22);
+ IntegerSensorIndex.ABSOLUTE_BAROMETRIC_PRESSURE, 22);
injectedEvent = mFreezeFrameProperties.addNewEvent(mFreezeFrameEventBuilder);
getMockedVehicleHal().injectEvent(injectedEvent);
assertTrue(listener.waitForEvent(injectedEvent.timestamp));
@@ -640,7 +640,7 @@
assertEquals(
22,
freezeFrame
- .getSystemIntegerSensor(Obd2IntegerSensorIndex.ABSOLUTE_BAROMETRIC_PRESSURE)
+ .getSystemIntegerSensor(IntegerSensorIndex.ABSOLUTE_BAROMETRIC_PRESSURE)
.intValue());
}
diff --git a/tools/emulator/diagnostic_sensors.py b/tools/emulator/diagnostic_sensors.py
index abde4b8..c808182 100644
--- a/tools/emulator/diagnostic_sensors.py
+++ b/tools/emulator/diagnostic_sensors.py
@@ -17,115 +17,115 @@
# This file is generated by types.hal by packages/services/Car/tools/update-obd2-sensors.py
# DO NOT EDIT MANUALLY
-OBD2_SENSOR_INTEGER_FUEL_SYSTEM_STATUS = 0
-OBD2_SENSOR_INTEGER_MALFUNCTION_INDICATOR_LIGHT_ON = 1
-OBD2_SENSOR_INTEGER_IGNITION_MONITORS_SUPPORTED = 2
-OBD2_SENSOR_INTEGER_IGNITION_SPECIFIC_MONITORS = 3
-OBD2_SENSOR_INTEGER_INTAKE_AIR_TEMPERATURE = 4
-OBD2_SENSOR_INTEGER_COMMANDED_SECONDARY_AIR_STATUS = 5
-OBD2_SENSOR_INTEGER_NUM_OXYGEN_SENSORS_PRESENT = 6
-OBD2_SENSOR_INTEGER_RUNTIME_SINCE_ENGINE_START = 7
-OBD2_SENSOR_INTEGER_DISTANCE_TRAVELED_WITH_MALFUNCTION_INDICATOR_LIGHT_ON = 8
-OBD2_SENSOR_INTEGER_WARMUPS_SINCE_CODES_CLEARED = 9
-OBD2_SENSOR_INTEGER_DISTANCE_TRAVELED_SINCE_CODES_CLEARED = 10
-OBD2_SENSOR_INTEGER_ABSOLUTE_BAROMETRIC_PRESSURE = 11
-OBD2_SENSOR_INTEGER_CONTROL_MODULE_VOLTAGE = 12
-OBD2_SENSOR_INTEGER_AMBIENT_AIR_TEMPERATURE = 13
-OBD2_SENSOR_INTEGER_TIME_WITH_MALFUNCTION_LIGHT_ON = 14
-OBD2_SENSOR_INTEGER_TIME_SINCE_TROUBLE_CODES_CLEARED = 15
-OBD2_SENSOR_INTEGER_MAX_FUEL_AIR_EQUIVALENCE_RATIO = 16
-OBD2_SENSOR_INTEGER_MAX_OXYGEN_SENSOR_VOLTAGE = 17
-OBD2_SENSOR_INTEGER_MAX_OXYGEN_SENSOR_CURRENT = 18
-OBD2_SENSOR_INTEGER_MAX_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE = 19
-OBD2_SENSOR_INTEGER_MAX_AIR_FLOW_RATE_FROM_MASS_AIR_FLOW_SENSOR = 20
-OBD2_SENSOR_INTEGER_FUEL_TYPE = 21
-OBD2_SENSOR_INTEGER_FUEL_RAIL_ABSOLUTE_PRESSURE = 22
-OBD2_SENSOR_INTEGER_ENGINE_OIL_TEMPERATURE = 23
-OBD2_SENSOR_INTEGER_DRIVER_DEMAND_PERCENT_TORQUE = 24
-OBD2_SENSOR_INTEGER_ENGINE_ACTUAL_PERCENT_TORQUE = 25
-OBD2_SENSOR_INTEGER_ENGINE_REFERENCE_PERCENT_TORQUE = 26
-OBD2_SENSOR_INTEGER_ENGINE_PERCENT_TORQUE_DATA_IDLE = 27
-OBD2_SENSOR_INTEGER_ENGINE_PERCENT_TORQUE_DATA_POINT1 = 28
-OBD2_SENSOR_INTEGER_ENGINE_PERCENT_TORQUE_DATA_POINT2 = 29
-OBD2_SENSOR_INTEGER_ENGINE_PERCENT_TORQUE_DATA_POINT3 = 30
-OBD2_SENSOR_INTEGER_ENGINE_PERCENT_TORQUE_DATA_POINT4 = 31
-OBD2_SENSOR_INTEGER_LAST_SYSTEM_INDEX = OBD2_SENSOR_INTEGER_ENGINE_PERCENT_TORQUE_DATA_POINT4
-OBD2_SENSOR_INTEGER_VENDOR_START_INDEX = OBD2_SENSOR_INTEGER_LAST_SYSTEM_INDEX + 1
+DIAGNOSTIC_SENSOR_INTEGER_FUEL_SYSTEM_STATUS = 0
+DIAGNOSTIC_SENSOR_INTEGER_MALFUNCTION_INDICATOR_LIGHT_ON = 1
+DIAGNOSTIC_SENSOR_INTEGER_IGNITION_MONITORS_SUPPORTED = 2
+DIAGNOSTIC_SENSOR_INTEGER_IGNITION_SPECIFIC_MONITORS = 3
+DIAGNOSTIC_SENSOR_INTEGER_INTAKE_AIR_TEMPERATURE = 4
+DIAGNOSTIC_SENSOR_INTEGER_COMMANDED_SECONDARY_AIR_STATUS = 5
+DIAGNOSTIC_SENSOR_INTEGER_NUM_OXYGEN_SENSORS_PRESENT = 6
+DIAGNOSTIC_SENSOR_INTEGER_RUNTIME_SINCE_ENGINE_START = 7
+DIAGNOSTIC_SENSOR_INTEGER_DISTANCE_TRAVELED_WITH_MALFUNCTION_INDICATOR_LIGHT_ON = 8
+DIAGNOSTIC_SENSOR_INTEGER_WARMUPS_SINCE_CODES_CLEARED = 9
+DIAGNOSTIC_SENSOR_INTEGER_DISTANCE_TRAVELED_SINCE_CODES_CLEARED = 10
+DIAGNOSTIC_SENSOR_INTEGER_ABSOLUTE_BAROMETRIC_PRESSURE = 11
+DIAGNOSTIC_SENSOR_INTEGER_CONTROL_MODULE_VOLTAGE = 12
+DIAGNOSTIC_SENSOR_INTEGER_AMBIENT_AIR_TEMPERATURE = 13
+DIAGNOSTIC_SENSOR_INTEGER_TIME_WITH_MALFUNCTION_LIGHT_ON = 14
+DIAGNOSTIC_SENSOR_INTEGER_TIME_SINCE_TROUBLE_CODES_CLEARED = 15
+DIAGNOSTIC_SENSOR_INTEGER_MAX_FUEL_AIR_EQUIVALENCE_RATIO = 16
+DIAGNOSTIC_SENSOR_INTEGER_MAX_OXYGEN_SENSOR_VOLTAGE = 17
+DIAGNOSTIC_SENSOR_INTEGER_MAX_OXYGEN_SENSOR_CURRENT = 18
+DIAGNOSTIC_SENSOR_INTEGER_MAX_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE = 19
+DIAGNOSTIC_SENSOR_INTEGER_MAX_AIR_FLOW_RATE_FROM_MASS_AIR_FLOW_SENSOR = 20
+DIAGNOSTIC_SENSOR_INTEGER_FUEL_TYPE = 21
+DIAGNOSTIC_SENSOR_INTEGER_FUEL_RAIL_ABSOLUTE_PRESSURE = 22
+DIAGNOSTIC_SENSOR_INTEGER_ENGINE_OIL_TEMPERATURE = 23
+DIAGNOSTIC_SENSOR_INTEGER_DRIVER_DEMAND_PERCENT_TORQUE = 24
+DIAGNOSTIC_SENSOR_INTEGER_ENGINE_ACTUAL_PERCENT_TORQUE = 25
+DIAGNOSTIC_SENSOR_INTEGER_ENGINE_REFERENCE_PERCENT_TORQUE = 26
+DIAGNOSTIC_SENSOR_INTEGER_ENGINE_PERCENT_TORQUE_DATA_IDLE = 27
+DIAGNOSTIC_SENSOR_INTEGER_ENGINE_PERCENT_TORQUE_DATA_POINT1 = 28
+DIAGNOSTIC_SENSOR_INTEGER_ENGINE_PERCENT_TORQUE_DATA_POINT2 = 29
+DIAGNOSTIC_SENSOR_INTEGER_ENGINE_PERCENT_TORQUE_DATA_POINT3 = 30
+DIAGNOSTIC_SENSOR_INTEGER_ENGINE_PERCENT_TORQUE_DATA_POINT4 = 31
+DIAGNOSTIC_SENSOR_INTEGER_LAST_SYSTEM_INDEX = DIAGNOSTIC_SENSOR_INTEGER_ENGINE_PERCENT_TORQUE_DATA_POINT4
+DIAGNOSTIC_SENSOR_INTEGER_VENDOR_START_INDEX = DIAGNOSTIC_SENSOR_INTEGER_LAST_SYSTEM_INDEX + 1
-OBD2_SENSOR_FLOAT_CALCULATED_ENGINE_LOAD = 0
-OBD2_SENSOR_FLOAT_ENGINE_COOLANT_TEMPERATURE = 1
-OBD2_SENSOR_FLOAT_SHORT_TERM_FUEL_TRIM_BANK1 = 2
-OBD2_SENSOR_FLOAT_LONG_TERM_FUEL_TRIM_BANK1 = 3
-OBD2_SENSOR_FLOAT_SHORT_TERM_FUEL_TRIM_BANK2 = 4
-OBD2_SENSOR_FLOAT_LONG_TERM_FUEL_TRIM_BANK2 = 5
-OBD2_SENSOR_FLOAT_FUEL_PRESSURE = 6
-OBD2_SENSOR_FLOAT_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE = 7
-OBD2_SENSOR_FLOAT_ENGINE_RPM = 8
-OBD2_SENSOR_FLOAT_VEHICLE_SPEED = 9
-OBD2_SENSOR_FLOAT_TIMING_ADVANCE = 10
-OBD2_SENSOR_FLOAT_MAF_AIR_FLOW_RATE = 11
-OBD2_SENSOR_FLOAT_THROTTLE_POSITION = 12
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR1_VOLTAGE = 13
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR1_SHORT_TERM_FUEL_TRIM = 14
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR1_FUEL_AIR_EQUIVALENCE_RATIO = 15
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR2_VOLTAGE = 16
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR2_SHORT_TERM_FUEL_TRIM = 17
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR2_FUEL_AIR_EQUIVALENCE_RATIO = 18
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR3_VOLTAGE = 19
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR3_SHORT_TERM_FUEL_TRIM = 20
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR3_FUEL_AIR_EQUIVALENCE_RATIO = 21
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR4_VOLTAGE = 22
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR4_SHORT_TERM_FUEL_TRIM = 23
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR4_FUEL_AIR_EQUIVALENCE_RATIO = 24
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR5_VOLTAGE = 25
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR5_SHORT_TERM_FUEL_TRIM = 26
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR5_FUEL_AIR_EQUIVALENCE_RATIO = 27
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR6_VOLTAGE = 28
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR6_SHORT_TERM_FUEL_TRIM = 29
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR6_FUEL_AIR_EQUIVALENCE_RATIO = 30
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR7_VOLTAGE = 31
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR7_SHORT_TERM_FUEL_TRIM = 32
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR7_FUEL_AIR_EQUIVALENCE_RATIO = 33
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR8_VOLTAGE = 34
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR8_SHORT_TERM_FUEL_TRIM = 35
-OBD2_SENSOR_FLOAT_OXYGEN_SENSOR8_FUEL_AIR_EQUIVALENCE_RATIO = 36
-OBD2_SENSOR_FLOAT_FUEL_RAIL_PRESSURE = 37
-OBD2_SENSOR_FLOAT_FUEL_RAIL_GAUGE_PRESSURE = 38
-OBD2_SENSOR_FLOAT_COMMANDED_EXHAUST_GAS_RECIRCULATION = 39
-OBD2_SENSOR_FLOAT_EXHAUST_GAS_RECIRCULATION_ERROR = 40
-OBD2_SENSOR_FLOAT_COMMANDED_EVAPORATIVE_PURGE = 41
-OBD2_SENSOR_FLOAT_FUEL_TANK_LEVEL_INPUT = 42
-OBD2_SENSOR_FLOAT_EVAPORATION_SYSTEM_VAPOR_PRESSURE = 43
-OBD2_SENSOR_FLOAT_CATALYST_TEMPERATURE_BANK1_SENSOR1 = 44
-OBD2_SENSOR_FLOAT_CATALYST_TEMPERATURE_BANK2_SENSOR1 = 45
-OBD2_SENSOR_FLOAT_CATALYST_TEMPERATURE_BANK1_SENSOR2 = 46
-OBD2_SENSOR_FLOAT_CATALYST_TEMPERATURE_BANK2_SENSOR2 = 47
-OBD2_SENSOR_FLOAT_ABSOLUTE_LOAD_VALUE = 48
-OBD2_SENSOR_FLOAT_FUEL_AIR_COMMANDED_EQUIVALENCE_RATIO = 49
-OBD2_SENSOR_FLOAT_RELATIVE_THROTTLE_POSITION = 50
-OBD2_SENSOR_FLOAT_ABSOLUTE_THROTTLE_POSITION_B = 51
-OBD2_SENSOR_FLOAT_ABSOLUTE_THROTTLE_POSITION_C = 52
-OBD2_SENSOR_FLOAT_ACCELERATOR_PEDAL_POSITION_D = 53
-OBD2_SENSOR_FLOAT_ACCELERATOR_PEDAL_POSITION_E = 54
-OBD2_SENSOR_FLOAT_ACCELERATOR_PEDAL_POSITION_F = 55
-OBD2_SENSOR_FLOAT_COMMANDED_THROTTLE_ACTUATOR = 56
-OBD2_SENSOR_FLOAT_ETHANOL_FUEL_PERCENTAGE = 57
-OBD2_SENSOR_FLOAT_ABSOLUTE_EVAPORATION_SYSTEM_VAPOR_PRESSURE = 58
-OBD2_SENSOR_FLOAT_SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK1 = 59
-OBD2_SENSOR_FLOAT_SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK2 = 60
-OBD2_SENSOR_FLOAT_SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK3 = 61
-OBD2_SENSOR_FLOAT_SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK4 = 62
-OBD2_SENSOR_FLOAT_LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK1 = 63
-OBD2_SENSOR_FLOAT_LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK2 = 64
-OBD2_SENSOR_FLOAT_LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK3 = 65
-OBD2_SENSOR_FLOAT_LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK4 = 66
-OBD2_SENSOR_FLOAT_RELATIVE_ACCELERATOR_PEDAL_POSITION = 67
-OBD2_SENSOR_FLOAT_HYBRID_BATTERY_PACK_REMAINING_LIFE = 68
-OBD2_SENSOR_FLOAT_FUEL_INJECTION_TIMING = 69
-OBD2_SENSOR_FLOAT_ENGINE_FUEL_RATE = 70
-OBD2_SENSOR_FLOAT_LAST_SYSTEM_INDEX = OBD2_SENSOR_FLOAT_ENGINE_FUEL_RATE
-OBD2_SENSOR_FLOAT_VENDOR_START_INDEX = OBD2_SENSOR_FLOAT_LAST_SYSTEM_INDEX + 1
+DIAGNOSTIC_SENSOR_FLOAT_CALCULATED_ENGINE_LOAD = 0
+DIAGNOSTIC_SENSOR_FLOAT_ENGINE_COOLANT_TEMPERATURE = 1
+DIAGNOSTIC_SENSOR_FLOAT_SHORT_TERM_FUEL_TRIM_BANK1 = 2
+DIAGNOSTIC_SENSOR_FLOAT_LONG_TERM_FUEL_TRIM_BANK1 = 3
+DIAGNOSTIC_SENSOR_FLOAT_SHORT_TERM_FUEL_TRIM_BANK2 = 4
+DIAGNOSTIC_SENSOR_FLOAT_LONG_TERM_FUEL_TRIM_BANK2 = 5
+DIAGNOSTIC_SENSOR_FLOAT_FUEL_PRESSURE = 6
+DIAGNOSTIC_SENSOR_FLOAT_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE = 7
+DIAGNOSTIC_SENSOR_FLOAT_ENGINE_RPM = 8
+DIAGNOSTIC_SENSOR_FLOAT_VEHICLE_SPEED = 9
+DIAGNOSTIC_SENSOR_FLOAT_TIMING_ADVANCE = 10
+DIAGNOSTIC_SENSOR_FLOAT_MAF_AIR_FLOW_RATE = 11
+DIAGNOSTIC_SENSOR_FLOAT_THROTTLE_POSITION = 12
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR1_VOLTAGE = 13
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR1_SHORT_TERM_FUEL_TRIM = 14
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR1_FUEL_AIR_EQUIVALENCE_RATIO = 15
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR2_VOLTAGE = 16
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR2_SHORT_TERM_FUEL_TRIM = 17
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR2_FUEL_AIR_EQUIVALENCE_RATIO = 18
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR3_VOLTAGE = 19
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR3_SHORT_TERM_FUEL_TRIM = 20
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR3_FUEL_AIR_EQUIVALENCE_RATIO = 21
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR4_VOLTAGE = 22
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR4_SHORT_TERM_FUEL_TRIM = 23
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR4_FUEL_AIR_EQUIVALENCE_RATIO = 24
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR5_VOLTAGE = 25
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR5_SHORT_TERM_FUEL_TRIM = 26
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR5_FUEL_AIR_EQUIVALENCE_RATIO = 27
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR6_VOLTAGE = 28
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR6_SHORT_TERM_FUEL_TRIM = 29
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR6_FUEL_AIR_EQUIVALENCE_RATIO = 30
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR7_VOLTAGE = 31
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR7_SHORT_TERM_FUEL_TRIM = 32
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR7_FUEL_AIR_EQUIVALENCE_RATIO = 33
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR8_VOLTAGE = 34
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR8_SHORT_TERM_FUEL_TRIM = 35
+DIAGNOSTIC_SENSOR_FLOAT_OXYGEN_SENSOR8_FUEL_AIR_EQUIVALENCE_RATIO = 36
+DIAGNOSTIC_SENSOR_FLOAT_FUEL_RAIL_PRESSURE = 37
+DIAGNOSTIC_SENSOR_FLOAT_FUEL_RAIL_GAUGE_PRESSURE = 38
+DIAGNOSTIC_SENSOR_FLOAT_COMMANDED_EXHAUST_GAS_RECIRCULATION = 39
+DIAGNOSTIC_SENSOR_FLOAT_EXHAUST_GAS_RECIRCULATION_ERROR = 40
+DIAGNOSTIC_SENSOR_FLOAT_COMMANDED_EVAPORATIVE_PURGE = 41
+DIAGNOSTIC_SENSOR_FLOAT_FUEL_TANK_LEVEL_INPUT = 42
+DIAGNOSTIC_SENSOR_FLOAT_EVAPORATION_SYSTEM_VAPOR_PRESSURE = 43
+DIAGNOSTIC_SENSOR_FLOAT_CATALYST_TEMPERATURE_BANK1_SENSOR1 = 44
+DIAGNOSTIC_SENSOR_FLOAT_CATALYST_TEMPERATURE_BANK2_SENSOR1 = 45
+DIAGNOSTIC_SENSOR_FLOAT_CATALYST_TEMPERATURE_BANK1_SENSOR2 = 46
+DIAGNOSTIC_SENSOR_FLOAT_CATALYST_TEMPERATURE_BANK2_SENSOR2 = 47
+DIAGNOSTIC_SENSOR_FLOAT_ABSOLUTE_LOAD_VALUE = 48
+DIAGNOSTIC_SENSOR_FLOAT_FUEL_AIR_COMMANDED_EQUIVALENCE_RATIO = 49
+DIAGNOSTIC_SENSOR_FLOAT_RELATIVE_THROTTLE_POSITION = 50
+DIAGNOSTIC_SENSOR_FLOAT_ABSOLUTE_THROTTLE_POSITION_B = 51
+DIAGNOSTIC_SENSOR_FLOAT_ABSOLUTE_THROTTLE_POSITION_C = 52
+DIAGNOSTIC_SENSOR_FLOAT_ACCELERATOR_PEDAL_POSITION_D = 53
+DIAGNOSTIC_SENSOR_FLOAT_ACCELERATOR_PEDAL_POSITION_E = 54
+DIAGNOSTIC_SENSOR_FLOAT_ACCELERATOR_PEDAL_POSITION_F = 55
+DIAGNOSTIC_SENSOR_FLOAT_COMMANDED_THROTTLE_ACTUATOR = 56
+DIAGNOSTIC_SENSOR_FLOAT_ETHANOL_FUEL_PERCENTAGE = 57
+DIAGNOSTIC_SENSOR_FLOAT_ABSOLUTE_EVAPORATION_SYSTEM_VAPOR_PRESSURE = 58
+DIAGNOSTIC_SENSOR_FLOAT_SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK1 = 59
+DIAGNOSTIC_SENSOR_FLOAT_SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK2 = 60
+DIAGNOSTIC_SENSOR_FLOAT_SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK3 = 61
+DIAGNOSTIC_SENSOR_FLOAT_SHORT_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK4 = 62
+DIAGNOSTIC_SENSOR_FLOAT_LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK1 = 63
+DIAGNOSTIC_SENSOR_FLOAT_LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK2 = 64
+DIAGNOSTIC_SENSOR_FLOAT_LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK3 = 65
+DIAGNOSTIC_SENSOR_FLOAT_LONG_TERM_SECONDARY_OXYGEN_SENSOR_TRIM_BANK4 = 66
+DIAGNOSTIC_SENSOR_FLOAT_RELATIVE_ACCELERATOR_PEDAL_POSITION = 67
+DIAGNOSTIC_SENSOR_FLOAT_HYBRID_BATTERY_PACK_REMAINING_LIFE = 68
+DIAGNOSTIC_SENSOR_FLOAT_FUEL_INJECTION_TIMING = 69
+DIAGNOSTIC_SENSOR_FLOAT_ENGINE_FUEL_RATE = 70
+DIAGNOSTIC_SENSOR_FLOAT_LAST_SYSTEM_INDEX = DIAGNOSTIC_SENSOR_FLOAT_ENGINE_FUEL_RATE
+DIAGNOSTIC_SENSOR_FLOAT_VENDOR_START_INDEX = DIAGNOSTIC_SENSOR_FLOAT_LAST_SYSTEM_INDEX + 1
diff --git a/tools/update-obd2-sensors.py b/tools/update-obd2-sensors.py
index 7f22f52..02acbc9 100755
--- a/tools/update-obd2-sensors.py
+++ b/tools/update-obd2-sensors.py
@@ -109,9 +109,9 @@
str(sensorId) + ";"
def prefix(self, theSensors):
- s = " public static final class Obd2%sSensorIndex {\n" % \
+ s = " public static final class %sSensorIndex {\n" % \
theSensors.descriptor
- s += " private Obd2%sSensorIndex() {}\n" % \
+ s += " private %sSensorIndex() {}\n" % \
theSensors.descriptor
return s
@@ -124,7 +124,7 @@
class PythonSensorPolicy(SensorPolicy):
"""The sensor policy that emits Python sensor descriptions."""
def sensor(self, theSensor, theSensors):
- return "OBD2_SENSOR_%s_%s = %s" % (
+ return "DIAGNOSTIC_SENSOR_%s_%s = %s" % (
theSensors.descriptor.upper(),
theSensor.name.upper(),
self.adjustSensorId(theSensors.descriptor.upper(), str(theSensor.id))
@@ -132,13 +132,13 @@
def adjustSensorId(self, descriptor, sensorId):
if sensorId.isdigit(): return sensorId
- return "OBD2_SENSOR_%s_%s" % (descriptor, sensorId.upper())
+ return "DIAGNOSTIC_SENSOR_%s_%s" % (descriptor, sensorId.upper())
class IntDefSensorPolicy(SensorPolicy):
"""The sensor policy that emits @IntDef sensor descriptions."""
def sensor(self, theSensor, theSensors):
sensorName = theSensor.name.replace("_INDEX", "")
- return "Obd2%sSensorIndex.%s," % (theSensors.descriptor,sensorName)
+ return "%sSensorIndex.%s," % (theSensors.descriptor,sensorName)
def prefix(self, theSensors):
return " @Retention(RetentionPolicy.SOURCE)\n @IntDef({"
@@ -147,7 +147,7 @@
return 8
def suffix(self, theSensors):
- return " })\n public @interface %sSensorIndex {}" % \
+ return " })\n public @interface Diagnostic%sSensorIndex {}" % \
theSensors.descriptor
class SensorMeta(type):
@@ -216,6 +216,7 @@
print("package android.car.hardware;", file=destfile)
print("", file=destfile)
print("import android.annotation.IntDef;", file=destfile)
+ print("import android.annotation.SystemApi;", file=destfile)
print("import java.lang.annotation.Retention;", file=destfile)
print("import java.lang.annotation.RetentionPolicy;", file=destfile)
print("", file=destfile)
@@ -227,6 +228,7 @@
print(" *", file=destfile)
print(" * @hide", file=destfile)
print(" */", file=destfile)
+ print("@SystemApi", file=destfile)
print("public final class CarDiagnosticSensorIndices {", file=destfile)
java(destfile)
intdef(destfile)
@@ -258,8 +260,8 @@
def load(filepath):
"""Load sensor data from Vehicle HAL."""
ast = hidl_parser.parser.parse(filepath)
- integerSensors = ast['enums']['Obd2IntegerSensorIndex']
- floatSensors = ast['enums']['Obd2FloatSensorIndex']
+ integerSensors = ast['enums']['DiagnosticIntegerSensorIndex']
+ floatSensors = ast['enums']['DiagnosticFloatSensorIndex']
for case in integerSensors.cases:
intSensor(name=case.name, id=case.value)
for case in floatSensors.cases:
diff --git a/vehicle-hal-support-lib/src/com/android/car/vehiclehal/DiagnosticEventBuilder.java b/vehicle-hal-support-lib/src/com/android/car/vehiclehal/DiagnosticEventBuilder.java
index 1e0c237..a4288e4 100644
--- a/vehicle-hal-support-lib/src/com/android/car/vehiclehal/DiagnosticEventBuilder.java
+++ b/vehicle-hal-support-lib/src/com/android/car/vehiclehal/DiagnosticEventBuilder.java
@@ -18,8 +18,8 @@
import android.hardware.automotive.vehicle.V2_0.VehiclePropConfig;
import android.hardware.automotive.vehicle.V2_0.VehiclePropValue;
-import android.hardware.automotive.vehicle.V2_1.Obd2FloatSensorIndex;
-import android.hardware.automotive.vehicle.V2_1.Obd2IntegerSensorIndex;
+import android.hardware.automotive.vehicle.V2_1.DiagnosticFloatSensorIndex;
+import android.hardware.automotive.vehicle.V2_1.DiagnosticIntegerSensorIndex;
import android.util.SparseArray;
import java.util.BitSet;
import java.util.Iterator;
@@ -109,9 +109,9 @@
public DiagnosticEventBuilder(
int propertyId, int numVendorIntSensors, int numVendorFloatSensors) {
mPropertyId = propertyId;
- mNumIntSensors = Obd2IntegerSensorIndex.LAST_SYSTEM_INDEX + 1 + numVendorIntSensors;
+ mNumIntSensors = DiagnosticIntegerSensorIndex.LAST_SYSTEM_INDEX + 1 + numVendorIntSensors;
final int numFloatSensors =
- Obd2FloatSensorIndex.LAST_SYSTEM_INDEX + 1 + numVendorFloatSensors;
+ DiagnosticFloatSensorIndex.LAST_SYSTEM_INDEX + 1 + numVendorFloatSensors;
mBitmask = new BitSet(mNumIntSensors + numFloatSensors);
mIntValues = new DefaultedArray<>(mNumIntSensors, 0);
mFloatValues = new DefaultedArray<>(numFloatSensors, 0.0f);