Post-O. Move OBD2 support to Vehicle HAL 2.1.
Test: build
Change-Id: Ia1fd2e3057d3a4d35e6be00b7e5a11440027a575
diff --git a/service/Android.mk b/service/Android.mk
index 4ba2dbd..835b2bc 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -44,6 +44,7 @@
LOCAL_JAVA_LIBRARIES += android.car
LOCAL_STATIC_JAVA_LIBRARIES += \
android.hardware.automotive.vehicle@2.0-java-static \
+ android.hardware.automotive.vehicle@2.1-java-static \
vehicle-hal-support-lib \
car-systemtest \
@@ -64,6 +65,7 @@
LOCAL_JAVA_LIBRARIES += android.car
LOCAL_STATIC_JAVA_LIBRARIES += \
android.hardware.automotive.vehicle@2.0-java-static \
+ android.hardware.automotive.vehicle@2.1-java-static \
vehicle-hal-support-lib \
car-systemtest \
diff --git a/service/src/com/android/car/hal/DiagnosticHalService.java b/service/src/com/android/car/hal/DiagnosticHalService.java
index 60c7778..f64e49c 100644
--- a/service/src/com/android/car/hal/DiagnosticHalService.java
+++ b/service/src/com/android/car/hal/DiagnosticHalService.java
@@ -21,12 +21,12 @@
import android.car.hardware.CarDiagnosticEvent;
import android.car.hardware.CarDiagnosticManager;
import android.car.hardware.CarSensorManager;
-import android.hardware.automotive.vehicle.V2_0.Obd2FloatSensorIndex;
-import android.hardware.automotive.vehicle.V2_0.Obd2IntegerSensorIndex;
import android.hardware.automotive.vehicle.V2_0.VehiclePropConfig;
import android.hardware.automotive.vehicle.V2_0.VehiclePropValue;
-import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
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.VehicleProperty;
import android.util.Log;
import android.util.SparseArray;
import com.android.car.CarLog;
diff --git a/tests/vehiclehal_test/Android.mk b/tests/vehiclehal_test/Android.mk
index 5f7c57f..56327bc 100644
--- a/tests/vehiclehal_test/Android.mk
+++ b/tests/vehiclehal_test/Android.mk
@@ -33,7 +33,8 @@
LOCAL_STATIC_JAVA_LIBRARIES += vehicle-hal-support-lib \
android-support-test \
- android.hardware.automotive.vehicle@2.0-java-static
+ android.hardware.automotive.vehicle@2.0-java-static \
+ android.hardware.automotive.vehicle@2.1-java-static
LOCAL_JAVA_LIBRARIES := android.car android.test.runner
diff --git a/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/Obd2LiveFrameTest.java b/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/Obd2LiveFrameTest.java
index 5a9bd84..4cdb403 100644
--- a/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/Obd2LiveFrameTest.java
+++ b/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/Obd2LiveFrameTest.java
@@ -23,10 +23,10 @@
import static org.junit.Assert.*;
import android.annotation.Nullable;
-import android.hardware.automotive.vehicle.V2_0.IVehicle;
import android.hardware.automotive.vehicle.V2_0.StatusCode;
import android.hardware.automotive.vehicle.V2_0.VehiclePropValue;
-import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
+import android.hardware.automotive.vehicle.V2_1.IVehicle;
+import android.hardware.automotive.vehicle.V2_1.VehicleProperty;
import android.os.RemoteException;
import android.util.Log;
import java.util.Objects;