fix sensor type comparison between car lib and support lib
- Handle snesors defined only in car lib while it is reserved in support lib
bug: 65125210
Test: the test
Change-Id: I002fe8e6fdccdaf2ae85f4d495b4689f0d19b321
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java
index bb84def..c60496b 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java
@@ -110,22 +110,24 @@
}
StringBuilder builder = new StringBuilder();
boolean failed = false;
- for (Field supprotCarSensorType : supportCarSensorTypes) {
+ for (Field supportCarSensorType : supportCarSensorTypes) {
Field androidCarSensorType = androidCarSensorTypeToField.get(
- supprotCarSensorType.getInt(null));
- assertNotNull("Sensor type:" + supprotCarSensorType.getName() +
+ supportCarSensorType.getInt(null));
+ assertNotNull("Sensor type:" + supportCarSensorType.getName() +
" not defined in android.car", androidCarSensorType);
- if (supprotCarSensorType.getName().equals(androidCarSensorType.getName())) {
+ if (supportCarSensorType.getName().equals(androidCarSensorType.getName())) {
// match ok
} else if (androidCarSensorType.getName().startsWith("SENSOR_TYPE_RESERVED")) {
// not used in android.car, ok
+ } else if (supportCarSensorType.getName().startsWith("SENSOR_TYPE_RESERVED")) {
+ // used in android.car but reserved in support.car
} else {
failed = true;
- builder.append("android.support sensor has name:" + supprotCarSensorType.getName() +
+ builder.append("android.support sensor has name:" + supportCarSensorType.getName() +
" while android.car sensor has name:" + androidCarSensorType.getName() +
"\n");
}
- androidCarSensorTypeToField.remove(supprotCarSensorType.getInt(null));
+ androidCarSensorTypeToField.remove(supportCarSensorType.getInt(null));
}
assertFalse(builder.toString(), failed);
assertTrue("android Car sensor has additional types defined:" + androidCarSensorTypeToField,