diff options
| author | Steve Paik <spaik@google.com> | 2018-06-04 14:53:47 -0700 |
|---|---|---|
| committer | Steve Paik <spaik@google.com> | 2018-06-04 15:21:05 -0700 |
| commit | 419f5efd172a72f87e674287ef12292e18067b6c (patch) | |
| tree | 84468f8f2817562f3e158cf71e3592290f64989a /service/src/com/android | |
| parent | c9ed1715883b263b984df73107619be46963050b (diff) | |
| download | Car-419f5efd172a72f87e674287ef12292e18067b6c.tar.gz | |
Rename VEHICLE_AREA_TYPE_NONE --> VEHICLE_AREA_TYPE_GLOBAL
Bug: 79921986
Test: runtest -x packages/services/Car/tests/carservice_test
`
Change-Id: I87876e066cfc9f4bbcbd3021c5057b8030292a48
Diffstat (limited to 'service/src/com/android')
| -rw-r--r-- | service/src/com/android/car/hal/CarPropertyUtils.java | 2 | ||||
| -rw-r--r-- | service/src/com/android/car/hal/VmsHalService.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/service/src/com/android/car/hal/CarPropertyUtils.java b/service/src/com/android/car/hal/CarPropertyUtils.java index f12da3a305..cbca08b335 100644 --- a/service/src/com/android/car/hal/CarPropertyUtils.java +++ b/service/src/com/android/car/hal/CarPropertyUtils.java @@ -171,7 +171,7 @@ import java.util.List; private static @VehicleAreaType.VehicleAreaTypeValue int getVehicleAreaType(int halArea) { switch (halArea) { case VehicleArea.GLOBAL: - return VehicleAreaType.VEHICLE_AREA_TYPE_NONE; + return VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL; case VehicleArea.SEAT: return VehicleAreaType.VEHICLE_AREA_TYPE_SEAT; case VehicleArea.DOOR: diff --git a/service/src/com/android/car/hal/VmsHalService.java b/service/src/com/android/car/hal/VmsHalService.java index bea3e2c088..fd84e2bf3d 100644 --- a/service/src/com/android/car/hal/VmsHalService.java +++ b/service/src/com/android/car/hal/VmsHalService.java @@ -802,7 +802,7 @@ public class VmsHalService extends HalServiceBase { private static VehiclePropValue toTypedVmsVehiclePropValue(int messageType) { VehiclePropValue vehicleProp = new VehiclePropValue(); vehicleProp.prop = HAL_PROPERTY_ID; - vehicleProp.areaId = VehicleAreaType.VEHICLE_AREA_TYPE_NONE; + vehicleProp.areaId = VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL; VehiclePropValue.RawValue v = vehicleProp.value; v.int32Values.add(messageType); |