summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot2018-04-26 02:22:08 -0500
committerandroid-build-team Robot2018-04-26 02:22:08 -0500
commit70563fb8dc9a8a6eb92a616e4ab2a43ca5735b92 (patch)
tree1081298a7669ccc6884da6e5ac12b6a2fa3e6ebc
parenta53319310ebb8c6506606d64fb710fdc4232f5bb (diff)
parent7fa25dee8f24c7e8b22f7e499efe1acabe979f31 (diff)
downloadplatform-hardware-interfaces-70563fb8dc9a8a6eb92a616e4ab2a43ca5735b92.tar.gz
platform-hardware-interfaces-70563fb8dc9a8a6eb92a616e4ab2a43ca5735b92.tar.xz
platform-hardware-interfaces-70563fb8dc9a8a6eb92a616e4ab2a43ca5735b92.zip
Snap for 4745538 from 7fa25dee8f24c7e8b22f7e499efe1acabe979f31 to pi-release
Change-Id: Ieb2324415e0cc7e791bf881ea338ab5fbd4d073c
-rw-r--r--automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h23
-rw-r--r--automotive/vehicle/2.0/types.hal26
-rw-r--r--current.txt4
-rw-r--r--graphics/composer/2.2/IComposerClient.hal7
4 files changed, 31 insertions, 29 deletions
diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
index 56813ce4..48ee1bb5 100644
--- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
@@ -242,17 +242,18 @@ const ConfigDeclaration kVehicleProperties[]{
242 }, 242 },
243 .initialValue = {.int32Values = {0, 0, 0}}}, 243 .initialValue = {.int32Values = {0, 0, 0}}},
244 244
245 {.config = 245 {.config = {.prop = toInt(VehicleProperty::HVAC_POWER_ON),
246 { 246 .access = VehiclePropertyAccess::READ_WRITE,
247 .prop = toInt(VehicleProperty::HVAC_POWER_ON), 247 .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
248 .access = VehiclePropertyAccess::READ_WRITE, 248 .areaConfigs = {VehicleAreaConfig{
249 .changeMode = VehiclePropertyChangeMode::ON_CHANGE, 249 .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}},
250 .areaConfigs = {VehicleAreaConfig{ 250 // TODO(bryaneyler): Ideally, this is generated dynamically from
251 .areaId = (VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_1_RIGHT)}}, 251 // kHvacPowerProperties.
252 // TODO(bryaneyler): Ideally, this is generated dynamically from 252 .configArray =
253 // kHvacPowerProperties. 253 {
254 .configString = "0x12400500,0x12400501" // HVAC_FAN_SPEED,HVAC_FAN_DIRECTION 254 0x12400500, // HVAC_FAN_SPEED
255 }, 255 0x12400501 // HVAC_FAN_DIRECTION
256 }},
256 .initialValue = {.int32Values = {1}}}, 257 .initialValue = {.int32Values = {1}}},
257 258
258 { 259 {
diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal
index 12e2257a..d4e4d468 100644
--- a/automotive/vehicle/2.0/types.hal
+++ b/automotive/vehicle/2.0/types.hal
@@ -2003,30 +2003,32 @@ enum VehicleLightSwitch : int32_t {
2003 2003
2004/** 2004/**
2005 * Used by INFO_EV_CONNECTOR_TYPE to enumerate the type of connectors 2005 * Used by INFO_EV_CONNECTOR_TYPE to enumerate the type of connectors
2006 * available to charge the vehicle. Consistent with projection protocol. 2006 * available to charge the vehicle.
2007 */ 2007 */
2008enum EvConnectorType : int32_t { 2008enum EvConnectorType : int32_t {
2009 /** 2009 /**
2010 * Default type if the vehicle does not know or report the EV connector 2010 * Default type if the vehicle does not know or report the EV connector
2011 * type. 2011 * type.
2012 */ 2012 */
2013 EV_CONNECTOR_TYPE_UNKNOWN = 0, 2013 UNKNOWN = 0,
2014 EV_CONNECTOR_TYPE_J1772 = 1, 2014 IEC_TYPE_1_AC = 1, // aka Yazaki
2015 EV_CONNECTOR_TYPE_MENNEKES = 2, 2015 IEC_TYPE_2_AC = 2, // aka Mennekes
2016 EV_CONNECTOR_TYPE_CHADEMO = 3, 2016 IEC_TYPE_3_AC = 3, // aka Scame
2017 EV_CONNECTOR_TYPE_COMBO_1 = 4, 2017 IEC_TYPE_4_DC = 4, // aka CHAdeMO
2018 EV_CONNECTOR_TYPE_COMBO_2 = 5, 2018 IEC_TYPE_1_CCS_DC = 5, // aka Combo 1
2019 EV_CONNECTOR_TYPE_TESLA_ROADSTER = 6, 2019 IEC_TYPE_2_CCS_DC = 6, // aka Combo 2
2020 EV_CONNECTOR_TYPE_TESLA_HPWC = 7, 2020 TESLA_ROADSTER = 7,
2021 EV_CONNECTOR_TYPE_TESLA_SUPERCHARGER = 8, 2021 TESLA_HPWC = 8,
2022 EV_CONNECTOR_TYPE_GBT = 9, 2022 TESLA_SUPERCHARGER = 9,
2023 GBT_AC = 10,
2024 GBT_DC = 11,
2023 2025
2024 /** 2026 /**
2025 * Connector type to use when no other types apply. Before using this 2027 * Connector type to use when no other types apply. Before using this
2026 * value, work with Google to see if the EvConnectorType enum can be 2028 * value, work with Google to see if the EvConnectorType enum can be
2027 * extended with an appropriate value. 2029 * extended with an appropriate value.
2028 */ 2030 */
2029 EV_CONNECTOR_TYPE_OTHER = 101, 2031 OTHER = 101,
2030}; 2032};
2031 2033
2032/** 2034/**
diff --git a/current.txt b/current.txt
index 75b1a06e..203f022f 100644
--- a/current.txt
+++ b/current.txt
@@ -299,7 +299,7 @@ f2904a4c108ad1b93eb2fa4e43b82bd01ce1ff26156316e49d1d9fc80dfecaad android.hardwar
2993b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types 2993b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types
300b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle 300b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle
3017ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback 3017ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback
3022e1815967a3e3278a7f304ed7efc04fbc56d0bb65b3126248c3a0d515b93f63d android.hardware.automotive.vehicle@2.0::types 302962b18e414231b5f3930d63daba116347241b3606242b0606b3699ba25b14315 android.hardware.automotive.vehicle@2.0::types
30332cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost 30332cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost
304ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload 304ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload
30527f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types 30527f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types
@@ -327,7 +327,7 @@ a830336ac8627d6432cfafb1b884343ad9f885dee0a5323e380e6d3c519156b8 android.hardwar
32783e7a10ff3702147bd7ffa04567b20d407a3b16bbb7705644af44d919afe9103 android.hardware.gnss@1.1::IGnssMeasurementCallback 32783e7a10ff3702147bd7ffa04567b20d407a3b16bbb7705644af44d919afe9103 android.hardware.gnss@1.1::IGnssMeasurementCallback
3280b96e0254e2168cfecb30c1ed5fb42681652cc00faa68c6e07568fafe64d1d50 android.hardware.graphics.common@1.1::types 3280b96e0254e2168cfecb30c1ed5fb42681652cc00faa68c6e07568fafe64d1d50 android.hardware.graphics.common@1.1::types
329d9b40a5b09962a5a0780b10fe33a4e607e69e2e088fc83de88a584115b7cb1c0 android.hardware.graphics.composer@2.2::IComposer 329d9b40a5b09962a5a0780b10fe33a4e607e69e2e088fc83de88a584115b7cb1c0 android.hardware.graphics.composer@2.2::IComposer
330c3cd2a3e245ffefae859c9a3d31382a9421be95cfa6bc1231571eb3533049b54 android.hardware.graphics.composer@2.2::IComposerClient 33018eff12102db47b03a5fa906f8d4fd9018f0fb9236c663d457b8eac8d57c2937 android.hardware.graphics.composer@2.2::IComposerClient
331dd83be076b6b3f10ed62ab34d8c8b95f2415961fb785200eb842e7bfb2b0ee92 android.hardware.graphics.mapper@2.1::IMapper 331dd83be076b6b3f10ed62ab34d8c8b95f2415961fb785200eb842e7bfb2b0ee92 android.hardware.graphics.mapper@2.1::IMapper
332675682dd3007805c985eaaec91612abc88f4c25b3431fb84070b7584a1a741fb android.hardware.health@2.0::IHealth 332675682dd3007805c985eaaec91612abc88f4c25b3431fb84070b7584a1a741fb android.hardware.health@2.0::IHealth
333434c4c32c00b0e54bb05e40c79503208b40f786a318029a2a4f66e34f10f2a76 android.hardware.health@2.0::IHealthInfoCallback 333434c4c32c00b0e54bb05e40c79503208b40f786a318029a2a4f66e34f10f2a76 android.hardware.health@2.0::IHealthInfoCallback
diff --git a/graphics/composer/2.2/IComposerClient.hal b/graphics/composer/2.2/IComposerClient.hal
index b7ba6a60..a6665a12 100644
--- a/graphics/composer/2.2/IComposerClient.hal
+++ b/graphics/composer/2.2/IComposerClient.hal
@@ -383,9 +383,8 @@ interface IComposerClient extends @2.1::IComposerClient {
383 * By default, layer dataspaces are mapped to the current color mode 383 * By default, layer dataspaces are mapped to the current color mode
384 * colorimetrically with a few exceptions. 384 * colorimetrically with a few exceptions.
385 * 385 *
386 * When the layer dataspace is a legacy sRGB dataspace 386 * When the layer dataspace is a legacy dataspace (see
387 * (Dataspace::SRGB_LINEAR, Dataspace::SRGB, or Dataspace::UNKNOWN when 387 * common@1.1::Dataspace) and the display render intent is
388 * treated as such) and the display render intent is
389 * RenderIntent::ENHANCE, the pixel values can go through an 388 * RenderIntent::ENHANCE, the pixel values can go through an
390 * implementation-defined saturation transform before being mapped to the 389 * implementation-defined saturation transform before being mapped to the
391 * current color mode colorimetrically. 390 * current color mode colorimetrically.
@@ -402,7 +401,7 @@ interface IComposerClient extends @2.1::IComposerClient {
402 * this: 401 * this:
403 * 402 *
404 * (in GLSL) 403 * (in GLSL)
405 * linearSrgb = clamp(saturationMatrix * linearSrgb, 0.0, 1.0); 404 * linearSrgb = saturationMatrix * linearSrgb;
406 * 405 *
407 * @param dataspace must be Dataspace::SRGB_LINEAR. 406 * @param dataspace must be Dataspace::SRGB_LINEAR.
408 * @return error is NONE upon success. Otherwise, 407 * @return error is NONE upon success. Otherwise,