diff options
| author | Enrico Granata <egranata@google.com> | 2017-07-28 20:32:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-28 20:32:22 +0000 |
| commit | 6af10a482b37a809733fd800625a14c697558a1a (patch) | |
| tree | 64c376de5094d0e4ec9b93d048a9f5b9d78a4e7a /service | |
| parent | afa194244b26ff5ff3af3d5c3ec0755a43ec00d3 (diff) | |
| parent | 976cee4a3583c66599e364badf9024df5022ee7a (diff) | |
| download | Car-6af10a482b37a809733fd800625a14c697558a1a.tar.gz | |
Merge "CarService changes necessary to support the diagnostic enums rename on the Vehicle HAL side" into oc-mr1-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/src/com/android/car/hal/DiagnosticHalService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/service/src/com/android/car/hal/DiagnosticHalService.java b/service/src/com/android/car/hal/DiagnosticHalService.java index 9bfd30d3a0..36cebf11af 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.car.hardware.CarSensorManager; 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 @@ public class DiagnosticHalService extends SensorHalServiceBase { } 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 @@ public class DiagnosticHalService extends SensorHalServiceBase { } 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( |