diff options
| author | Keun-young Park <keunyoung@google.com> | 2016-10-07 17:24:36 -0700 |
|---|---|---|
| committer | Keun-young Park <keunyoung@google.com> | 2016-10-07 17:26:16 -0700 |
| commit | db161e2a29be92a3943643fe621e4b63620b50a4 (patch) | |
| tree | 1be9080684d81ebe75a2e696ce181c67e5f5a011 /libvehiclenetwork | |
| parent | 14ec18d16cd2c8814897864195fa5607ac39b056 (diff) | |
| parent | 150d8de43e71a624106e90bcc04067414c42ef18 (diff) | |
| download | Car-db161e2a29be92a3943643fe621e4b63620b50a4.tar.gz | |
Merge nyc-car-dev
2678da20 remove CaeOperartionNotSUpportedException
8968e1d3 Remove drivers seat from vehicle.h
ed8609ea Fix AAE activity blocking.
cdb5f8ca Merge "Fix AAE activity blocking." into nyc-car-dev
16ef4c6d Merge "Remove drivers seat from vehicle.h" into nyc-car-dev
af2cc99a more api clean-up
150d8de4 CarNotConnectedException cleanup
bug: 32029701
Test: manual
Change-Id: I1ee86de3f498e5445f7f53486621c23a3984adb2
Diffstat (limited to 'libvehiclenetwork')
| -rw-r--r-- | libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetworkConsts.java | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetworkConsts.java b/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetworkConsts.java index 9dcb2102d0..b0cd19bdbd 100644 --- a/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetworkConsts.java +++ b/libvehiclenetwork/java/src/com/android/car/vehiclenetwork/VehicleNetworkConsts.java @@ -1126,30 +1126,26 @@ default: return "UNKNOWN"; } public static class VehicleSeat { -public static final int VEHICLE_SEAT_DRIVER_LHD = 0x0001; -public static final int VEHICLE_SEAT_DRIVER_RHD = 0x0002; -public static final int VEHICLE_SEAT_ROW_1_PASSENGER_LEFT = 0x0010; -public static final int VEHICLE_SEAT_ROW_1_PASSENGER_CENTER = 0x0020; -public static final int VEHICLE_SEAT_ROW_1_PASSENGER_RIGHT = 0x0040; -public static final int VEHICLE_SEAT_ROW_2_PASSENGER_LEFT = 0x0100; -public static final int VEHICLE_SEAT_ROW_2_PASSENGER_CENTER = 0x0200; -public static final int VEHICLE_SEAT_ROW_2_PASSENGER_RIGHT = 0x0400; -public static final int VEHICLE_SEAT_ROW_3_PASSENGER_LEFT = 0x1000; -public static final int VEHICLE_SEAT_ROW_3_PASSENGER_CENTER = 0x2000; -public static final int VEHICLE_SEAT_ROW_3_PASSENGER_RIGHT = 0x4000; +public static final int VEHICLE_SEAT_ROW_1_LEFT = 0x0001; +public static final int VEHICLE_SEAT_ROW_1_CENTER = 0x0002; +public static final int VEHICLE_SEAT_ROW_1_RIGHT = 0x0004; +public static final int VEHICLE_SEAT_ROW_2_LEFT = 0x0010; +public static final int VEHICLE_SEAT_ROW_2_CENTER = 0x0020; +public static final int VEHICLE_SEAT_ROW_2_RIGHT = 0x0040; +public static final int VEHICLE_SEAT_ROW_3_LEFT = 0x0100; +public static final int VEHICLE_SEAT_ROW_3_CENTER = 0x0200; +public static final int VEHICLE_SEAT_ROW_3_RIGHT = 0x0400; public static String enumToString(int v) { switch(v) { -case VEHICLE_SEAT_DRIVER_LHD: return "VEHICLE_SEAT_DRIVER_LHD"; -case VEHICLE_SEAT_DRIVER_RHD: return "VEHICLE_SEAT_DRIVER_RHD"; -case VEHICLE_SEAT_ROW_1_PASSENGER_LEFT: return "VEHICLE_SEAT_ROW_1_PASSENGER_LEFT"; -case VEHICLE_SEAT_ROW_1_PASSENGER_CENTER: return "VEHICLE_SEAT_ROW_1_PASSENGER_CENTER"; -case VEHICLE_SEAT_ROW_1_PASSENGER_RIGHT: return "VEHICLE_SEAT_ROW_1_PASSENGER_RIGHT"; -case VEHICLE_SEAT_ROW_2_PASSENGER_LEFT: return "VEHICLE_SEAT_ROW_2_PASSENGER_LEFT"; -case VEHICLE_SEAT_ROW_2_PASSENGER_CENTER: return "VEHICLE_SEAT_ROW_2_PASSENGER_CENTER"; -case VEHICLE_SEAT_ROW_2_PASSENGER_RIGHT: return "VEHICLE_SEAT_ROW_2_PASSENGER_RIGHT"; -case VEHICLE_SEAT_ROW_3_PASSENGER_LEFT: return "VEHICLE_SEAT_ROW_3_PASSENGER_LEFT"; -case VEHICLE_SEAT_ROW_3_PASSENGER_CENTER: return "VEHICLE_SEAT_ROW_3_PASSENGER_CENTER"; -case VEHICLE_SEAT_ROW_3_PASSENGER_RIGHT: return "VEHICLE_SEAT_ROW_3_PASSENGER_RIGHT"; +case VEHICLE_SEAT_ROW_1_LEFT: return "VEHICLE_SEAT_ROW_1_LEFT"; +case VEHICLE_SEAT_ROW_1_CENTER: return "VEHICLE_SEAT_ROW_1_CENTER"; +case VEHICLE_SEAT_ROW_1_RIGHT: return "VEHICLE_SEAT_ROW_1_RIGHT"; +case VEHICLE_SEAT_ROW_2_LEFT: return "VEHICLE_SEAT_ROW_2_LEFT"; +case VEHICLE_SEAT_ROW_2_CENTER: return "VEHICLE_SEAT_ROW_2_CENTER"; +case VEHICLE_SEAT_ROW_2_RIGHT: return "VEHICLE_SEAT_ROW_2_RIGHT"; +case VEHICLE_SEAT_ROW_3_LEFT: return "VEHICLE_SEAT_ROW_3_LEFT"; +case VEHICLE_SEAT_ROW_3_CENTER: return "VEHICLE_SEAT_ROW_3_CENTER"; +case VEHICLE_SEAT_ROW_3_RIGHT: return "VEHICLE_SEAT_ROW_3_RIGHT"; default: return "UNKNOWN"; } } |