Commit graph

329 commits

Author SHA1 Message Date
Steve Paik
e980916bd7 Add EV parameters to VHAL
Add parameters:
  - INFO_FUEL_TYPE
  - INFO_EV_BATTERY_CAPACITY
  - INFO_EV_CONNECTOR_TYPE
  - ENGINE_ON
  - FUEL_LEVEL
  - FUEL_DOOR_OPEN
  - EV_BATTERY_LEVEL
  - EV_CHARGE_PORT_OPEN
  - EV_CHARGE_PORT_CONNECTED
  - EV_BATTERY_INSTANTANEOUS_CHARGE_RATE

Added enums:
  - EvConnectorType
  - FuelType

Bug: 63330964
Test: Embedded Kitchen Sink can access the params

Change-Id: Iaedbb02db91d354ebed98fbae4c1ba204098e152
2017-11-09 00:13:51 -08:00
Steven Moreland
f390f03aa4 Update for Soong-only makefiles.
Test: pass
Bug: 33420795
Change-Id: Ibec6d1e38939b9e7566a96381439be2aac3bf8ca
2017-10-11 18:30:28 +00:00
Steven Moreland
70bfb9d250 Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f am: b53e6ad535
am: 9a17f41f6f

Change-Id: I78d9292068b372238554fd9d35128e69f5b5f9d2
2017-10-04 21:54:11 +00:00
Steven Moreland
9a17f41f6f Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f
am: b53e6ad535

Change-Id: I23269fb7a9bdd352e670a80f390527d9eef31412
2017-10-04 21:51:00 +00:00
Steven Moreland
861651985f Merge "Update for hidl adapter module defaults."
am: 988c977079

Change-Id: I289818be1b30397391847ba1c532d1014fdbed27
2017-10-04 21:45:09 +00:00
Steven Moreland
527fd76a0e Update for hidl adapter module defaults.
Test: pass
Change-Id: Idc6a943149a279bf17cfcfd0f2571473e53bbbbf
2017-10-04 12:47:03 -07:00
Steven Moreland
91799c6cc7 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3 am: 71a193a425
am: 9fdd241905

Change-Id: I1c852fa6600fecc44d5afd1a65a5f51c43ecf71c
2017-09-27 00:02:52 +00:00
Steven Moreland
9fdd241905 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3
am: 71a193a425

Change-Id: I45ae43f07323254212532acbf0f891d11143b05f
2017-09-26 23:58:51 +00:00
Steven Moreland
f07e364ce3 Merge "Fix typo in update makefiles."
am: 9960148420

Change-Id: I949634e72f817f3a5411130e968acd8efd1d7725
2017-09-26 23:51:07 +00:00
Steven Moreland
a5299ee739 Fix typo in update makefiles.
Bug: 37518178
Test: pass
Change-Id: Ic401b3a473f15ca4c01e58b3072e19db7c31b653
2017-09-26 21:59:43 +00:00
Steven Moreland
7741c0e17b Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e am: b94d0c7290
am: 97228c0b7d

Change-Id: Ic4b459b7c1a4325453945b0b00db8f44e4e77c26
2017-09-26 13:36:09 +00:00
Steven Moreland
97228c0b7d Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e
am: b94d0c7290

Change-Id: If766cffbcc003cc0cc5eb98969b924aa918fff44
2017-09-26 12:53:13 +00:00
Steven Moreland
73949c1d7e Update makefiles for hidl adapter.
am: 26a0bb2762

Change-Id: I3a811f5cd49bd4e81e8fcd5c8e88922115812539
2017-09-25 23:14:44 +00:00
Steven Moreland
26a0bb2762 Update makefiles for hidl adapter.
Bug: 37518178
Test: manual
Change-Id: I50e999907d3c64d2b039272b823971998da64d1b
2017-09-25 18:35:56 +00:00
TreeHugger Robot
ffc151ca2a Merge "Register mock EVS driver as EvsEnumeratorHw" 2017-09-19 21:34:45 +00:00
Scott Randolph
34daf2ff7c Register mock EVS driver as EvsEnumeratorHw
This makes the mock driver (when loaded and running) serve as THE evs
driver for the system.  Facilitates VTS tests running, etc.
This driver should not run on a production system as it should have a
"real" driver registered instead.

Change-Id: I716f8f8226e7152521375b94013828a3aa2bb9f0
BUg: 65376941
Test: boot mojave, then 'ps -lef | grep evs'
2017-09-19 14:29:21 -07:00
TreeHugger Robot
4cebe832f9 Merge "Remove java static libs from automotive." 2017-09-14 23:05:29 +00:00
Steven Moreland
caf05a0474 Remove java static libs from automotive.
Now that all the usages are cleaned up, ran update-
makefiles.sh on them.

Test: pass
Change-Id: Id5b7bf67fa7b1251a28c5f835306c253cd0d3473
2017-09-14 09:28:20 -07:00
TreeHugger Robot
6f53db667b Merge "Add 'vendor.' prefix to a vendor HAL service name" 2017-09-12 06:34:56 +00:00
Enrico Granata
3b62ca8ce2 Do not write initial empty values for the diagnostic properties. There is a separate step that initializes them with meaningful values. am: ad2baebb3b
am: 8beffc61fb

Change-Id: I239505a8b1a4b3cb90a02e7980d256c9e9222678
2017-09-12 02:17:30 +00:00
Jaekyun Seok
81104ae5ef Add 'vendor.' prefix to a vendor HAL service name
To prevent property name collisions between properties of system and
vendor, 'vendor.' prefix must be added to a vendor HAL service name.
You can see the details in http://go/treble-sysprop-compatibility.

Test: succeeded building and tested on a walleye device
Bug: 36796459
Change-Id: I4e8fbee791ec917a8f627a1366f4d44ec7e6febc
2017-09-12 08:01:42 +09:00
Enrico Granata
ad2baebb3b Do not write initial empty values for the diagnostic properties.
There is a separate step that initializes them with meaningful values.

Change-Id: I2480a029773b62b0e77b8c52c73f2ee465caf17c
Fixes: b/65125128
Test: runtest -x packages/services/Car/tests/android_car_api_test/src/android/car/apitest/CarDiagnosticManagerTest.java
2017-09-11 15:06:40 -07:00
Scott Randolph
552f24634c Merge "Additonal usage note updates for Audio properties" into oc-mr1-dev am: ecc01b9c36
am: 15373a9494

Change-Id: Ic4f08b3f88baaade77714d5d6b5bf008b08123ce
2017-09-06 23:26:05 +00:00
Scott Randolph
66339cfc3a Additonal usage note updates for Audio properties
Mostly comment updates for clarification.
Updates the names of a few constants (but not their value nor usage).

Test: build for Mojave
Change-Id: Ic9021f82fa4bd960189e005f074f2b407be13ae7
bug: 65384336
2017-09-05 16:49:00 -07:00
Scott Randolph
b02563e7fa Merge "Add RINGTONE to Vehicle HAL AUDIO_FOCUS" into oc-mr1-dev am: b58c3ccdde
am: 6839b6cdd3

Change-Id: Ifb2a50ca5398bb488bfd3a4257e8ce473996df81
2017-09-05 22:10:55 +00:00
Scott Randolph
065a085a3f Add RINGTONE to Vehicle HAL AUDIO_FOCUS
Test:  build on Mojave with associated CarService changes
Change-Id: I7fcf9b4bb1808971f4fc8265a7d581dce57be3d3
Bug: 64729839
2017-09-05 12:12:16 -07:00
Pavel Maltsev
8d37cf60b2 resolve merge conflicts of 0d6eca0e to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id762ceddec08446d76769ea5c7a2a791ed6fd1c8
2017-08-25 05:35:53 -07:00
Pavel Maltsev
250139c8b0 Merge Vehicle HAL 2.1 iface to 2.0
Vehicle HAL is property based and all properties are considered
optional. It is quite a bit of pain to create new versions of VHAL only
to extend properties.

Bug: 64303350

Test: build and flash, verefied system works stable.
Change-Id: I8adb858f53a5d9d31f7444bf97ae09baf2fffafa
2017-08-24 21:59:18 -07:00
Pavel Maltsev
2b90ff20df Merge "Increase thread pool for VHAL 2.1" into oc-mr1-dev am: b96a339f5a
am: 681ec8c328

Change-Id: I24d49731fcbec3f721b304ca4e3b4a062f39abe4
2017-08-18 17:15:01 +00:00
Pavel Maltsev
d4ffeb71bc Increase thread pool for VHAL 2.1
Fixes: 36510399

Test: runtest -x
packages/services/Car/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/E2ePerformanceTest.java

Change-Id: Id5638f63c6ff23bb78675fa07a2f3922bb7e3d73
2017-08-18 16:54:01 +00:00
Steven Moreland
dfd8287506 Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Merged-In: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
Change-Id: I170fa1c4fe39f8109b1670db58ef99bb11afc0be
2017-08-14 20:25:09 +00:00
Steven Moreland
ff308ea6ba Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Change-Id: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
2017-08-11 22:58:47 +00:00
Enrico Granata
bb38d1487c Merge "Mark diagnostic values as either being numerically equivalent to OBD2 values, or providing the equivalent OBD2 value" into oc-mr1-dev am: e6aeacdaa1
am: a650d503c9

Change-Id: I4c92bdb215b831ef9a14546f0780cdb621b7cc29
2017-08-11 01:58:19 +00:00
TreeHugger Robot
e6aeacdaa1 Merge "Mark diagnostic values as either being numerically equivalent to OBD2 values, or providing the equivalent OBD2 value" into oc-mr1-dev 2017-08-11 01:47:49 +00:00
Justin Yun
723c2dbd43 Update make file for vndk enabled. am: 608d773ef8
am: d66371512c

Change-Id: I35b778c39c2349346278deb6dea56b8cd3701f7d
2017-08-05 02:17:38 +00:00
Justin Yun
d66371512c Update make file for vndk enabled.
am: 608d773ef8

Change-Id: I6ea2891c61edaa2f8e1657544e3d2fb5011626c8
2017-08-05 02:10:40 +00:00
TreeHugger Robot
0a21415efa Merge changes from topic 'hidl-vndk-enabled-oc-mr1' into oc-mr1-dev
* changes:
  Mark hidl utils as vndk
  Manually update makefile for vndk-sp hidl libs.
  Update make file for vndk enabled.
2017-08-05 02:01:37 +00:00
Steve Paik
a40456311f Merge "Implement comments from API review" into oc-mr1-dev am: 3bb18be633
am: d02223d4f6

Change-Id: If8b723f4cf624e461152ec7346291cb160091d41
2017-08-04 21:09:36 +00:00
TreeHugger Robot
3bb18be633 Merge "Implement comments from API review" into oc-mr1-dev 2017-08-04 20:40:34 +00:00
Justin Yun
608d773ef8 Update make file for vndk enabled.
Update the Android.bp generated with hidl-gen.

Test: build with and without BOARD_VNDK_VERSION=current
Bug: 63866913
Change-Id: I1a9db1df49e0f13c5790da2b118ae9ec63ba34a7
2017-08-04 14:12:23 +09:00
Steve Paik
ec73701e4c Implement comments from API review
Bug:  64372008
Test:  Fix comments
Change-Id: Ia2bc0ae4c45015e7965b544f5d46f7e2a3ff0e2a
2017-08-03 19:36:29 -07:00
Enrico Granata
7f7a54ee3b Mark diagnostic values as either being numerically equivalent to OBD2 values, or providing the equivalent OBD2 value
Test: build
Bug: 64024685
Change-Id: I24ef13514a94e10c599605e6970a023168774049
2017-08-03 23:53:38 +00:00
TreeHugger Robot
4eb6cca5cc Merge "Update makefiles (frameworks.jar)." 2017-08-03 23:10:49 +00:00
Steven Moreland
6ae7aad171 Update makefiles (frameworks.jar).
Test: links at runtime and buildtime
Bug: 35771640
Change-Id: Ic7a71653d659115205e5bdbb782f73b774af0b29
2017-08-03 23:02:46 +00:00
Enrico Granata
ffb1bbbae2 Merge "Fix a typo in one of the OBD2 ignition monitors" into oc-mr1-dev am: 72c691df3c
am: 8e5a8d5d0d

Change-Id: I2c337ece79875ffef70e672b907225063e0280cb
2017-08-03 22:10:23 +00:00
TreeHugger Robot
72c691df3c Merge "Fix a typo in one of the OBD2 ignition monitors" into oc-mr1-dev 2017-08-03 21:58:52 +00:00
Tri Vo
0621d2f517 Update Android.bp HIDL makefiles am: f5d136c231
am: 7694738e26

Change-Id: I7592025d540bbe46d2e2726ae39ae34f352a1a30
2017-08-03 15:37:24 +00:00
Yuexi Ma
a40e787946 Merge "rename VtsHalEvsV1_0Target module to VtsHalEvsV1_0TargetTest" 2017-08-03 04:12:57 +00:00
Tri Vo
f5d136c231 Update Android.bp HIDL makefiles
Allow HAL definition libs to be static.

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1483d572bea6799717d1614fb7d52fe225e31104
2017-08-03 00:30:01 +00:00
Yuexi Ma
c446be1563 rename VtsHalEvsV1_0Target module to VtsHalEvsV1_0TargetTest
Test: run vts-selftest
Change-Id: Ib413d3ee2bffbb98489a5e787b83014c3b2e3af9
2017-08-02 12:44:48 -07:00
Enrico Granata
8864792125 Fix a typo in one of the OBD2 ignition monitors
Test: build
Bug: 64024685
Change-Id: Iab438e53ef71e61a4f58af48171bb0151a602fd6
2017-08-01 16:58:51 -07:00
Enrico Granata
40ca962c86 Merge "Improvements to the documentation for the OBD2 properties" into oc-mr1-dev am: c2fa0484ed
am: 603e7f0867

Change-Id: I1185ed56330f5822b0aa4867900042cd7e0b5a45
2017-08-01 01:11:33 +00:00
TreeHugger Robot
c2fa0484ed Merge "Improvements to the documentation for the OBD2 properties" into oc-mr1-dev 2017-08-01 00:40:56 +00:00
Asaf Rosenfeld
49fcb88525 Merge "Rename and Redoc VMS HAL defs." into oc-mr1-dev am: e2a3ca9cac
am: 6bd319b40b

Change-Id: Ia752a91579057b7cfd506f6a80d765d3af8a3958
2017-07-31 23:38:16 +00:00
Asaf Rosenfeld
01d10a11cf Rename and Redoc VMS HAL defs.
Test: All tests has been adjusted to post review names and pass.
Bug: 64093467
Change-Id: I7b5646b179030b59b87abc23ffe6a2a81e1b74b2
2017-07-31 16:40:42 +00:00
Enrico Granata
d10c9bb447 Merge "Rename the enums that are supposed to match OBD2 values to have an Obd2 prefix Rename the enums that contain a list of sensors and don't directly map to OBD2 to have a Diagnostic prefix" into oc-mr1-dev am: a732c00feb
am: 5517e5dbad

Change-Id: I487243e4b13ba5cf913f0808db702d01819491c6
2017-07-28 20:53:08 +00:00
Enrico Granata
390ced6134 Improvements to the documentation for the OBD2 properties
Addition of a flag to the configuration for OBD2_FREEZE_FRAME_CLEAR
to indicate support for deletion of individual freeze frames.

Test: build
Bug: 64024685
Change-Id: I43cc448c801a5d59095be03d8056530364860ef5
2017-07-28 13:34:34 -07:00
Enrico Granata
5aa4b5d232 Rename the enums that are supposed to match OBD2 values to have an Obd2 prefix
Rename the enums that contain a list of sensors and don't directly map to OBD2 to have a Diagnostic prefix

Test: clean build and flash, then
runtest -x packages/services/Car/tests/android_car_api_test/src/android/car/apitest/CarDiagnosticManagerTest.java
runtest -x packages/services/Car/tests/carservice_test/src/com/android/car/test/CarDiagnosticManagerTest.java
runtest -x packages/services/Car/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/Obd2FreezeFrameTest.java
runtest -x packages/services/Car/tests/vehiclehal_test/src/com/android/car/vehiclehal/test/Obd2LiveFrameTest.java

Bug: 64024685
Change-Id: I9147bcd8f2972dee9f3d1e62f8978b595d88f606
2017-07-25 17:20:53 -07:00
Enrico Granata
3c112a3ea6 Merge "Remove unnecessary whitespace from enum members in OBD2 properties" into oc-mr1-dev am: 87a14154a9
am: e371a4c8b0

Change-Id: I771e9ca90e4008ed2b8d6cd39ae434c9f2b9cee9
2017-07-25 21:51:47 +00:00
Enrico Granata
ada97632a8 Remove unnecessary whitespace from enum members in OBD2 properties
Test: build
Bug: 64024685
Change-Id: I205aa80e0f1f9ed8e3b78e993f87dae69b883b3a
2017-07-25 17:54:57 +00:00
Asaf Rosenfeld
69069ea11c Add publisher ID to DATA messages am: e8d8c03e9a
am: 0c6cd2f60c

Change-Id: Ice1aec3b91c0f26f76e4d9259484eab3cad370b4
2017-07-22 01:30:03 +00:00
Asaf Rosenfeld
e8d8c03e9a Add publisher ID to DATA messages
VMS Core routing needs the publisher ID in order to route correctly.

Test: all tests pass + adding tests for new use cases
bug: 63933446
Change-Id: I3acd2a3efebdedbf9d65af18d70928380e9b44d1
2017-07-21 20:35:56 +00:00
Scott Randolph
82494aa6fb Merge "Update vehicle hal usage comments" 2017-07-20 23:28:49 +00:00
Steve Paik
85d75ba634 Merge "Fix WHEEL_TICK + and add friends" 2017-07-19 20:17:54 +00:00
Steve Paik
dd98d966c5 Fix WHEEL_TICK + and add friends
Bug: 62876582
Test: Embedded Kitchen Sink works with VHAL emulator
Change-Id: Ifb631e69697658dd3e7b25ec22421b511fd1759b
2017-07-18 16:02:57 -07:00
TreeHugger Robot
bc8d764140 Merge "Rename VtsHalEvsV1_0 Target" 2017-07-14 11:21:56 +00:00
bansukkim
815b52d800 Rename VtsHalEvsV1_0 Target
Test: mma
Bug: 62349323

Change-Id: I9f5c9ab808a524b5aebe1ff1ac8e411d196d2d15
2017-07-14 09:10:34 +00:00
Scott Randolph
95b4f6ad10 Update vehicle hal usage comments
Fix typos and clarify a couple of sentences in the descriptive comments
associated with Vehicle HAL (especially with respect to AUDIO).

Test:  make -j40
Change-Id: If3bcb82a68d28c5560398174e5201227c15596d4
2017-07-13 19:29:30 -07:00
Tri Vo
22b2d68170 Build automotive hals with VNDK.
Bug: 37342627
Test: cd hardware/interfaces/automotive &&
BOARD_VNDK_VERSION=current mma -j64 -k
Change-Id: I89e9af8a5fded3a31eedb9942cfba8e8d9614f53
2017-07-12 16:25:27 -07:00
Tri Vo
fc87140da9 convert vehicle to .bp
Test: cd hardware/interfaces/automotive && mma -j64
Change-Id: I851c9b2ff956b0f6d9d7a6076d495aad9038a66a
2017-07-11 12:55:13 -07:00
Enrico Granata
7d8dad4013 The VehiclePropValue response for OBD2_FREEZE_FRAME_INFO didn't have the property ID set correctly
Test: make vts BUILD_GOOGLE_VTS=true -j32 && vts-tradefed run commandAndExit vts -m VtsHalAutomotiveVehicleV2_1Host
Change-Id: I9b4d5f19657301f2d1c98c0811dcfa39cca85381
2017-07-06 15:55:30 -07:00
TreeHugger Robot
49517aa66c Merge "Update service name targeted by VTS test" 2017-06-30 17:46:29 +00:00
Scott Randolph
968b355572 Update service name targeted by VTS test
Use the standard driver rather than the "mock" driver for testing.
Test:  Run the test.

Change-Id: I706eabaf33f6879a22359250ce02daaf4a7fe15f
2017-06-29 18:59:40 -07:00
Steve Paik
108919b1e7 Add HVAC_AUTO_RECIRC_ON property
Bug:  32870841
Test:  Compiles - property will be implemented in VHAL
Change-Id: I5092a95bb9396833e3530bdcfa162a0fbce2cec5
2017-06-28 15:04:02 -07:00
TreeHugger Robot
5e463f12c5 Merge "Revert "EVS: Android.bp -> Android.mk"" 2017-06-26 23:26:57 +00:00
Steven Moreland
731531d87f Revert "EVS: Android.bp -> Android.mk"
This reverts commit ee4f923b31.

Change-Id: I8b8490b3e828a9a31af8f6f823d9c70e1c11c9c5
2017-06-26 19:22:03 +00:00
Steven Moreland
5e2d6e2959 Merge "Remove toString methods in Vehicle HAL." into oc-dev-plus-aosp
am: 990b076833

Change-Id: If04916713fd01e6b0b98f24d72ce684e83a3dfd0
2017-06-23 17:23:57 +00:00
Asaf Rosenfeld
03a2b77928 Merge "Adding Publisher ID to VMS HAL messages" 2017-06-23 04:56:26 +00:00
Steven Moreland
cb4537288b Remove toString methods in Vehicle HAL.
These methods are already generated by HIDL, but this is
only now being realized.

Test: methods no longer conflict
Merged-In: I522630267beb7f87713a0a54c1ecb38077dc1b4e
Change-Id: I522630267beb7f87713a0a54c1ecb38077dc1b4e
2017-06-21 23:56:32 +00:00
Steven Moreland
c525408c60 Remove toString methods in Vehicle HAL.
These methods are already generated by HIDL, but this is
only now being realized.

Test: methods no longer conflict
Change-Id: I522630267beb7f87713a0a54c1ecb38077dc1b4e
2017-06-21 12:57:02 -07:00
Asaf Rosenfeld
322a326ea4 Adding Publisher ID to VMS HAL messages
Test: all tests were adjusted and pass
Change-Id: I4514b14d298d8464c0aabf62286529e5da2cda96
2017-06-16 14:48:21 -07:00
Asaf Rosenfeld
c193a1eb82 Merge "Adding an index for Vms Layer Subtype Will rename ID to type in another CL so messages include Type and Subtype instead of Id and subtype." 2017-06-09 22:26:09 +00:00
Asaf Rosenfeld
9095dc8e41 Adding an index for Vms Layer Subtype
Will rename ID to type in another CL so messages include Type and Subtype instead of Id and subtype.

Test: All VMS tests are adjusted and pass.
Bug:b/37627272

Change-Id: I039f952ff944605ca46a8f6f6f484aac830fc46e
2017-06-09 13:05:45 -07:00
Steve Paik
d841094820 Add support of generating fake events via emulator
Bug:  62358398
Test:  Python scripts can enable fake events
Change-Id: Id933ae59fc4d763572b88f58367a3aef0af52b6b
2017-06-06 10:24:53 -07:00
Alex Yakavenka
a7e01d7d71 Merge "Compile manager-lib shared library" into oc-dev
am: fe4705facb

Change-Id: Ia54a09338625ddd4006b4c831e6000317ce69ede
2017-06-01 22:21:33 +00:00
TreeHugger Robot
9603549973 Merge "Put correct user/group in EVS mock driver .rc file" 2017-05-31 22:36:09 +00:00
Scott Randolph
e70dd7a71a Put correct user/group in EVS mock driver .rc file
If this module is included on a target platform, it will start at boot
time (but not very early) since it isn't actually need for backing up a
real car.  This makes it available for testing.

Test: build gordon_peak
Change-Id: I79bc2dafa1a8db579a1c3cc801bac8e4e1d01872
2017-05-30 18:53:46 -07:00
TreeHugger Robot
49a880c52c Merge "Compile manager-lib shared library" 2017-05-31 01:44:55 +00:00
Alex Yakavenka
e99ae12e62 Compile manager-lib shared library
bug: 38424350
Test: Local build
Change-Id: Idd03b8bac365f17b7fc418016d2c250a199384fe
2017-05-30 21:47:03 +00:00
Alex Yakavenka
773bf5aa08 Compile manager-lib shared library
bug: 38424350
Test: Local build
Change-Id: Idd03b8bac365f17b7fc418016d2c250a199384fe
2017-05-26 17:41:01 +00:00
Scott Randolph
6471d6cd43 Merge "Fix typos in IEvsEnumerator descriptive comment" into oc-dev am: fd8da20eca
am: 34d7fe47aa

Change-Id: I0b64b1fb1c4c87d7d2ede832c20fa8d173440a2c
2017-05-26 00:28:07 +00:00
Scott Randolph
34d7fe47aa Merge "Fix typos in IEvsEnumerator descriptive comment" into oc-dev
am: fd8da20eca

Change-Id: I0c1dcb81b0f2afb2d7065ceee72125af9d7980ee
2017-05-26 00:25:42 +00:00
TreeHugger Robot
fd8da20eca Merge "Fix typos in IEvsEnumerator descriptive comment" into oc-dev 2017-05-26 00:14:47 +00:00
Scott Randolph
3209fb3738 Fix typos in IEvsEnumerator descriptive comment
IEvsEnumerator::openCamera had a typo and the incorrect name of a related
interface in one of the descriptive comments.  This fixes those issues
and updates the checksum for the interface.

Bug: 38508696
Test: build evs_app and evs default driver.
Change-Id: I24f3ca2bc3652711a4ee2ea9a37428d4bdafc509
2017-05-22 16:58:15 -07:00
Steven Moreland
7708449766 Update makefiles. (2/2) am: 76cfb84140
am: f203167814

Change-Id: I1f13401266f3c2f78c627088b09c79cd7c8d0276
2017-05-22 17:29:04 +00:00
Steven Moreland
f203167814 Update makefiles. (2/2)
am: 76cfb84140

Change-Id: I24d21438a5b2f447d2160929c6ff6e17b2b66820
2017-05-22 17:15:20 +00:00
Steven Moreland
76cfb84140 Update makefiles. (2/2)
Adds default configuration for all hals.

Bug: 38415912
Test: pass
Change-Id: Idd1f3a2b7b16ad956d31784a513e93a066cdd02e
2017-05-19 15:54:03 -07:00
TreeHugger Robot
060e3c72b4 Merge "Eliminate redundant #includes and a missing one" 2017-05-12 19:24:57 +00:00
Scott Randolph
3446440623 Eliminate redundant #includes and a missing one
Minor cleanup that fell out of a debugging effort.
Test:  Build and run vehicle hal on gordon peak

Change-Id: I29bcb74f3eac96df303139b2717b06c8dfedb839
2017-05-11 17:43:14 -07:00
Steven Moreland
d09cf863da Update makefiles for c++-sources and c++-headers. (2/2) am: bc71124120
am: a32ebce372

Change-Id: Ic1dd8f98e72656bc12a6e5224e541f75afb79daa
2017-05-11 01:38:14 +00:00
Steven Moreland
a32ebce372 Update makefiles for c++-sources and c++-headers. (2/2)
am: bc71124120

Change-Id: Icf36068a4d863a8520854c7a83e51f960c188e12
2017-05-11 00:48:55 +00:00
Steven Moreland
bc71124120 Update makefiles for c++-sources and c++-headers. (2/2)
Test: pass
Bug: 38174080
Change-Id: Icad451f9f9ad5f46412356a4171a8a1222f8e545
2017-05-09 19:58:43 -07:00
Ram Periathiruvadi
4f65adf509 Merge "Add DOOR_LOCK to default config." into oc-dev
am: c63bdfbd74

Change-Id: I2386d09d237957da9f7ea146412b5a36cbf208a6
2017-05-09 21:31:44 +00:00
Ram Periathiruvadi
9e39f63fec Add DOOR_LOCK to default config.
One of the triggers for Bluetooth Auto connect is a door unlock signal.
Adding it to the list of default supported properties.

Bug: b/37674555
Test: Auto connect triggers on adb shell dumpsys activity service
com.android.car inject-event zoned-boolean 0x16200b02 1 false

Change-Id: Icfed9ea57239cd2397f3e71dcfaccd767a2e9739
(cherry picked from commit e17a009d5d)
2017-05-08 18:35:36 +00:00
Ram Periathiruvadi
e17a009d5d Add DOOR_LOCK to default config.
One of the triggers for Bluetooth Auto connect is a door unlock signal.
Adding it to the list of default supported properties.

Bug: b/37674555
Test: Auto connect triggers on adb shell dumpsys activity service
com.android.car inject-event zoned-boolean 0x16200b02 1 false

Change-Id: Icfed9ea57239cd2397f3e71dcfaccd767a2e9739
2017-05-04 11:31:05 -07:00
Scott Randolph
cca1c72280 A header was pulled in for a function we no longer use, so we can/should
drop the #include as well.

Test:  compile
Change-Id: I455f3a1137533e14297a310663e1b3f7ecb0607c
2017-05-02 17:58:05 -07:00
TreeHugger Robot
9c8a2d6d45 Merge "EVS: Android.bp -> Android.mk" 2017-05-02 22:39:20 +00:00
Steven Moreland
5c63b11f76 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Merged-In: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
2017-05-02 15:29:30 -07:00
TreeHugger Robot
31944dc58e Merge "Remove redundant dependencies" 2017-05-02 21:51:28 +00:00
Steven Moreland
ee4f923b31 EVS: Android.bp -> Android.mk
EVS currently violates VNDK restrictions. Since it is in Soong,
this effects all targets. Temporarily converting it to make
until its dependencies are figured out so that we can enable
the VNDK on continuous integration only for Soong targets.

Test: links
Bug: 37426620
Change-Id: I9935ac764a4339bf8831ac720ab3de783c43f94f
2017-05-02 14:21:23 -07:00
TreeHugger Robot
cbe9865043 Merge "Vehicle: IWYU" into oc-dev-plus-aosp 2017-05-02 19:18:33 +00:00
Scott Randolph
6f5391be16 Merge "Add YUV support in EVS VTS tests" into oc-dev am: b3d108de74
am: 9a4edfb40b

Change-Id: I1e68f72ecf39dd2e4730dbe5b7e7b7ca414c86e0
2017-05-02 19:11:12 +00:00
Scott Randolph
9a4edfb40b Merge "Add YUV support in EVS VTS tests" into oc-dev
am: b3d108de74

Change-Id: I66c5c2cc4b08ee9dd8ec5f2f7d24d5fcda71245c
2017-05-02 19:06:43 +00:00
Steven Moreland
aee42f01dc Vehicle: IWYU
Missing dependency that was being transitively included
from MQDescriptor.h.

Test: links
Bug: 37791060
Change-Id: I90ccb2edabab8c63429caa0884f6c5820c29fe11
(cherry picked from commit 356c2ced1d)
2017-05-02 19:03:54 +00:00
Steven Moreland
2cd0d42d72 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
2017-05-02 10:17:28 -07:00
Scott Randolph
fec62bc136 Add YUV support in EVS VTS tests
Additionally adds log markers at test start and ends tests early which
fail necessary preconditions.
Test:  Run against default and sample EVS drivers
bug:  37687125

Change-Id: Ie34674df5fe099dd4f380df485801ab0288147e9
2017-05-02 10:09:33 -07:00
Steven Moreland
356c2ced1d Vehicle: IWYU
Missing dependency that was being transitively included
from MQDescriptor.h.

Test: links
Bug: 37791060
Change-Id: I90ccb2edabab8c63429caa0884f6c5820c29fe11
2017-05-02 09:53:59 -07:00
Steven Moreland
eb8e1a7dc5 vehicle: respect result of registerAsService
(cherry picked from commit e50f2efab5)

Test: works with https://android-review.googlesource.com/c/358172/
Change-Id: I73bb43f0759f4e396ededf4d8ef7f13711c13276
2017-04-28 04:22:39 +00:00
TreeHugger Robot
1195320158 Merge "vehicle: respect result of registerAsService" 2017-04-27 02:59:01 +00:00
Steven Moreland
e50f2efab5 vehicle: respect result of registerAsService
Test: works with https://android-review.googlesource.com/c/358172/
Change-Id: I73bb43f0759f4e396ededf4d8ef7f13711c13276
2017-04-26 11:43:25 -07:00
Enrico Granata
c8ed5eb615 Merge "Don't set hidl_string's buffer to nullptr" 2017-04-26 17:21:15 +00:00
Asaf Rosenfeld
fd2259e756 Merge "split availability command into request and response" 2017-04-26 00:33:00 +00:00
Enrico Granata
01f5121a33 Don't set hidl_string's buffer to nullptr
Sending a null hidl_string from native code to Java is currently not
a supported operation and will cause a crash. As originally written,
shallowCopy would set a hidl_string to null as soon as a non-empty
stringValue was followed by an empty stringValue. Since freeze frames
come with a string value (the DTC) and live frames doesn't, this would
cause all diagnostics to crash while reading VehiclePropValue from parcel
immediately after dispatching a freeze frame. Fix by resetting empty strings
to a global non-null but zero length buffer.

Bug: 37435530
Test: diagnostic_injector.py
Change-Id: Ie79174dd7ab3d266f1e3addefa5ba9e2128ea9f8
2017-04-25 14:20:33 -07:00
Asaf Rosenfeld
5d9b428ff8 split availability command into request and response
Test: verified all VMS tests
Bug: b/37074894
Change-Id: Ia4beb5a08982990b14ee71920714e0808c2bffa3
2017-04-25 11:26:33 -07:00
Chris Forbes
88e89ef467 Merge changes from topic 'o-usage64-2' into oc-dev am: 441c1cb7d7
am: d350340340

Change-Id: I68fb3ba765ce0d55231e149a8b6a51fd42a19088
2017-04-25 04:27:24 +00:00
TreeHugger Robot
441c1cb7d7 Merge changes from topic 'o-usage64-2' into oc-dev
* changes:
  automotive: Adjust tests for libui gralloc flags change
  camera: Adjust for libui gralloc flags change
2017-04-25 04:12:31 +00:00
Pavel Maltsev
a4e82724da Merge "Fix failing VTS test cases" into oc-dev am: d77a4a5585
am: 0dbe46536b

Change-Id: I55813abb627487337b17c7e90e734687812f0485
2017-04-24 22:52:27 +00:00
Chris Forbes
f90642b8f8 automotive: Adjust tests for libui gralloc flags change
Change-Id: Ia88d8fc664196eae7153ccfb755ea9c3d135fd0c
Bug: b/33350696
Test: Bullhead: booted to launcher, take photo, watch youtube
2017-04-21 18:33:41 +00:00
Pavel Maltsev
0e251c8805 Fix failing VTS test cases
Also, increase number of binder threads in VHAL for performance testing

Fix: b/37543801, b/36778517
Bug: b/36510399

Test: make vts BUILD_GOOGLE_VTS=true -j32 && vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalAutomotiveVehicleV2_0Host -l INFO && adb shell /data/nativetest64/android.hardware.automotive.vehicle@2.0-manager-unit-tests/android.hardware.automotive.vehicle@2.0-manager-unit-tests
Change-Id: I850c6be328f1a07ae3fda898a18137c76afe3115
2017-04-21 09:49:16 -07:00
TreeHugger Robot
0bb2fc80d7 Merge "Set the property ID before writing freeze frames" 2017-04-19 19:24:15 +00:00
Pavel Maltsev
decc02b6f5 Merge "Use IBinder to identify callbacks in VHAL" into oc-dev am: 2e25e562fa
am: 84163bc36f

Change-Id: Ifa921d812d63f2833e015201e8a1d111383b10ef
2017-04-18 23:51:44 +00:00
TreeHugger Robot
2e25e562fa Merge "Use IBinder to identify callbacks in VHAL" into oc-dev 2017-04-18 23:23:10 +00:00
Pavel Maltsev
41a000da58 Use IBinder to identify callbacks in VHAL
Right now there's no way to distinguish multiple clients, thus we cannot
associate IVehicleCallback from subscribe and unsubscribe method. As a
temporary solution we will use pointer to IBinder from underlying proxy
object until HILD will have some API to do that.

Test: verified unit tests run, checked that subsequent 'subscribe' calls
do not create new client objects in VHAL

Bug: b/37254245
Change-Id: I029564b7b03e4821287c2110d0929a5c4cbce0ce
2017-04-18 14:20:11 -07:00
Pavel Maltsev
753f3b0d1e Merge "Adding a custom property to the default VHAL impl" into oc-dev am: 69c42429d1
am: 7bac03deb2

Change-Id: I1ece0ab7a50274e4957155e01d4db50b9b52e645
2017-04-17 21:23:51 +00:00
TreeHugger Robot
69c42429d1 Merge "Adding a custom property to the default VHAL impl" into oc-dev 2017-04-17 20:57:38 +00:00
Pavel Maltsev
794fc4f9ff Adding a custom property to the default VHAL impl
This property is supposed to be used mostly from e2e tests (a simple
test-case is provided in separate CL)

Test: make -j && runtest -x packages/services/Car/tests/vehiclehal_test/

Bug: b/36510399
Change-Id: I09b24f22ab328eee1ef6add60901ed03bf046874
2017-04-17 10:39:27 -07:00
Enrico Granata
0d77167f5c Set the property ID before writing freeze frames
This fixes an issue where the default freeze frame data was not seen
by the diagnostic manager as it was never correctly stored in the database.

Test: manual in KitchenSink
Bug: 37327195
Change-Id: Ice33d8571daa52ae758ff2ac9926b6ea0b3a495c
2017-04-14 00:54:28 +00:00
Andreas Huber
6fa374ad30 Changed the naming scheme for Treble java libraries (both static and dynamic)
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: I177f4cfd42f635aaf096107af8309d1a82ed41c0
Merged-In: I8b91881dfaf507c0d852d56ebbb53ff0987e5a34
2017-04-13 15:23:46 -07:00
Andreas Huber
e6e54801c1 Changed the naming scheme for Treble java libraries (both static and dynamic)
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: I8b91881dfaf507c0d852d56ebbb53ff0987e5a34
2017-04-13 14:28:05 -07:00
Steven Moreland
d5bf55bd5a Merge changes from topic 'hidl-vendor-available' into oc-dev am: 17f0c0dde7
am: fce6b7f0d9

Change-Id: Ic95bee140e0bbbf094e89dcc7d0d99c30966786c
2017-04-12 22:54:17 +00:00
Antonio Cortes Perez
6ec2f58fa9 Merge "Adding VMS subscription HAL definitions." 2017-04-11 18:10:18 +00:00
Steven Moreland
3b36a83a2e Update makefiles (2/2).
Test: pass
Change-Id: Ic7e6289c7b69785491708ce0acbb657f4c704229
2017-04-11 09:58:03 -07:00
Chia-I Wu
4e91f7f17a Merge "graphics: revise gralloc interfaces" into oc-dev am: 586fd648d5
am: 51db3bcee4

Change-Id: I42e9059f793ff8fc5de84e534d108af6072e09ce
2017-04-11 01:29:37 +00:00
Chia-I Wu
79d13ff0f5 graphics: revise gralloc interfaces
Revise IAllocator and IMapper to reduce IPC and to support gralloc0
devices.

Specifically, IAllocator is trimmed down to have essentially only

    allocate(BufferDescriptor descriptor, uint32_t count)
        generates (Error error,
                   uint32_t stride,
                   vec<handle> buffers);

The ability to allocate buffers with shared backing store is
removed.  ProducerUsage and ConsumerUsage are moved to the
graphics.common package and are merged and renamed to BufferUsage.
BufferUsage's bits follow gralloc0.

IMapper gains

    typedef vec<uint32_t> BufferDescriptor;
    createDescriptor(BufferDescriptorInfo descriptorInfo)
          generates (Error error,
                     BufferDescriptor descriptor);

where BufferDescriptor is an implementation-defined blob.  lockFlex
is replaced by lockYCbCr.  All getters are removed.

Reference counting with retain/release is replaced by
importBuffer/freeBuffer.

Most if not all gralloc1 features are not used by the runtime yet.
There is also not too much test written for them.  As such, they
tend to behave differently between implementations and cannot be
used reliably.

Bug: 36481301
Test: builds and boots on Pixel
Change-Id: I1d31105120517ea2c128c7a19297acf3bfd312bb
2017-04-10 11:15:54 -07:00
Antonio Cortes
978cc33b06 Adding VMS subscription HAL definitions.
Test: build
Bug: 36137379
Change-Id: Id10fe1660d2165a677b4ce9dc7cc8a19c4e958c0
2017-04-10 09:41:36 -07:00
TreeHugger Robot
04b10ccc41 Merge "Fix transitive includes." 2017-04-06 23:36:13 +00:00
Steven Moreland
4e7a307730 Fix transitive includes.
Files relying on transitive include of utils/Log.h (and things that it
includes) from MQDescriptor.h

Test: pass
Merged-In: Iff316b21bef556bb026378b7f89e97ded3febef4
Change-Id: Iff316b21bef556bb026378b7f89e97ded3febef4
2017-04-06 22:04:05 +00:00
Steven Moreland
3eb7df74b8 Fix transitive includes.
Files relying on transitive include of utils/Log.h (and things that it
includes) from MQDescriptor.h

Test: pass
Change-Id: Iff316b21bef556bb026378b7f89e97ded3febef4
2017-04-06 15:01:59 -07:00
Scott Randolph
796507cf83 Merge "Use explicit .c_str() for hidl_string" into oc-dev am: f059ae420d
am: 0070a334b0

Change-Id: I13e2e0d1ad1fd596bb5ebf6694816b41332840d8
2017-04-06 20:09:56 +00:00
Scott Randolph
f059ae420d Merge "Use explicit .c_str() for hidl_string" into oc-dev 2017-04-06 18:01:48 +00:00