Commit graph

418 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Antonio Cortes
978cc33b06 Adding VMS subscription HAL definitions.
Test: build
Bug: 36137379
Change-Id: Id10fe1660d2165a677b4ce9dc7cc8a19c4e958c0
2017-04-10 09:41:36 -07: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
Pavel Maltsev
eef66f11b8 resolve merge conflicts of 3e942409 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia4867c10c2b28298fc493020e2dc44e885837dcc
2017-04-06 09:06:49 -07:00
Pavel Maltsev
33676528f8 Extract logic of storing values to separate class
Also rename DefaultVehicleHal to EmulatedVehicleHal and
extract emulator related code to VehicleEmulator class

Test: mm -j32 ; verified Car Service worked

Change-Id: I34361fdec6f94629cf7ef6c35ff56ef9ce78b855
2017-04-06 05:07:44 +00:00
Enrico Granata
5ecfdeacd9 Fix an issue where Vehicle HAL would crash when trying to update a continuous property without an initial floating-point value
Bug: 36858992
Test: build, flash and boot

(cherry picked from commit 945d0bbc86)

Merged-In: I9906abbf386cf75e838102299e3e97de3475db63
Change-Id: I19ef534fde190a3a1adaca377e8f09760c0ccf4e
2017-04-06 05:06:43 +00:00
Pavel Maltsev
8166677c4b Refactor default values in VHAL
Move default values closer to config declration to add properties
with less pain in future.

Test: mm -j32; verified if Car Service works

(cherry picked from commit 24ade17518)
Merged-In: I2f18837658149eb657f44d81e34eb8e6e497a25c
Change-Id: Ie4285581fa9d871b366b0ed2f08fa8073739a0a9
2017-04-06 05:01:49 +00:00
Asaf Rosenfeld
45dcdc4000 Merge "Adding availability HAL support" 2017-04-06 02:55:19 +00:00
Asaf Rosenfeld
5847a00f25 Adding availability HAL support
Test: as part of a seperate CL that uses this enum

Change-Id: Ibd9664547c2281b61e4b74c4cd30ffef457865a8
2017-04-05 14:10:43 -07:00
Pavel Maltsev
270aeae9f4 Remove dependency to libbinder in VHAL
Also, removed per property ACL as it was based on client UID

Test: mm -j ; verified Car Service works

Bug: b/36649684
Change-Id: I7625a013dda8e3ebce5b86a253a8c1befe267c11
(cherry picked from commit 72aebeb3ec)
2017-04-03 23:02:22 +00:00
Enrico Granata
945d0bbc86 Fix an issue where Vehicle HAL would crash when trying to update a continuous property without an initial floating-point value
Bug: 36858992
Test: build, flash and boot
Change-Id: I9906abbf386cf75e838102299e3e97de3475db63
2017-04-03 12:59:00 -07:00
TreeHugger Robot
90defcf6bf Merge "Refactor default values in VHAL" 2017-03-31 23:33:29 +00:00
TreeHugger Robot
a5ecf4604a Merge "Remove dependency to libbinder in VHAL" 2017-03-31 22:27:55 +00:00
Pavel Maltsev
24ade17518 Refactor default values in VHAL
Move default values closer to config declration to add properties
with less pain in future.

Test: mm -j32; verified if Car Service works
Change-Id: I2f18837658149eb657f44d81e34eb8e6e497a25c
2017-03-30 11:25:36 -07:00
bohu
48e4002b2e Revert "Revert "Fix build after ag/2001747 breakage.""
This reverts commit 430d0510e6.

Test: I build full-eng successfully

Change-Id: I77166a8a36e893be476a1067356124914a607c39
2017-03-29 19:39:41 +00:00
Andreas Huber
40d3a9bd8c Convert all comments into "doxygen-ready" comments.
Bug: 36453077
Test: mma
Change-Id: I0b1f77dfae5d2258969e33d85ecf45401ffbdfaa
2017-03-29 08:53:58 -07:00
Pavel Maltsev
72aebeb3ec Remove dependency to libbinder in VHAL
Also, removed per property ACL as it was based on client UID

Test: mm -j ; verified Car Service works

Bug: b/36649684
Change-Id: I7625a013dda8e3ebce5b86a253a8c1befe267c11
2017-03-28 16:32:00 -07:00
Steven Moreland
561b602a99 Update makefiles for hwtypes.h
Test: pass
Change-Id: I8e17eb8fec5d2f04c526476a866c8dd54ccb556c
2017-03-28 15:18:20 +00:00
Enrico Granata
15e12268ff Add logic for VHAL versions > 2.0 to forward property information to 2.0
Use this infrastructure to move OBD2_LIVE_FRAME support over to the Vehicle HAL 2.0 layer.

This is useful in DefaultVehicleHal 2.0 to let the Emulator layer send/receive information about properties defined by later VehicleHal versions.
Additionally, support the notion that a custom property thusly defined might have logic more intricate than simply a property Id and an area Id,
via a custom handler object that supports get() and set() operations. A default handler object simply falls back to a stored VehiclePropValue, but
more complex implementations are possible.

Test: manual testing in Python:
import vhal_consts_2_0 as c
from vhal_emulator import Vhal

v = Vhal(c.vhal_types_2_0)

v.getConfig(c.VEHICLE_PROPERTY_HVAC_TEMPERATURE_SET)
print v.rxMsg()

v.setProperty(c.VEHICLE_PROPERTY_HVAC_TEMPERATURE_SET, c.VEHICLE_ZONE_ROW_1_LEFT, 70)
print v.rxMsg()

v.getProperty(c.VEHICLE_PROPERTY_HVAC_TEMPERATURE_SET, c.VEHICLE_ZONE_ROW_1_LEFT)
print v.rxMsg()

v.getProperty(0x11e00d00, 0)
print v.rxMsg()

plus

runtest Obd2LiveFrame.java

Change-Id: I9c342e6e2c9ff581beacd238a42780ca10f96d9c
2017-03-21 15:11:16 -07:00
Steven Moreland
54cc198022 update-makefiles for transisitive dependencies
Test: pass
Bug: 36162559
Change-Id: I4f5fddaef9811f0da1d69fa26a5d34830a1a9634
2017-03-20 07:13:46 -07:00
Pavel Maltsev
7005f9f643 Fix typo CELCIUS -> CELSIUS in Vehicle HAL
Test: typo in comments only.
Change-Id: I1610beb9cb44b3b50e9a86fcff41d3421c6ad849
2017-03-15 10:49:28 -07:00
Pavel Maltsev
3fc25be745 Fix config map in default Vehicle HAL impl
Test: tested through VTS
Change-Id: Ibcf607d0ad5cc39291b0d8a159ca3ad849bea8ce
2017-03-14 12:15:46 -07:00
Pavel Maltsev
fb6617935a Fix HvacPowerOn vehicle property
Test: VTS test is now passing
Change-Id: I815645310822bf24c8ee3a37f00c9d78a1e9b666
2017-03-14 11:58:22 -07:00
Pavel Maltsev
8e92b749f4 Merge "Fix static properties to comply with VTS" 2017-03-10 01:18:49 +00:00
TreeHugger Robot
54b2e5e9c8 Merge "Treat warnings as errors in VHAL unit test" 2017-03-10 01:12:07 +00:00
Antonio Cortes Perez
2102b7e765 Merge "Placeholder for future implementation of VMS property in the default hal." 2017-03-08 23:26:01 +00:00
Pavel Maltsev
ff89b0ed42 Treat warnings as errors in VHAL unit test
Test: mm -j

Change-Id: Ic174d0550d621ef8508377db97db33f813c06ab1
Fix: b/34901911
2017-03-08 15:16:24 -08:00
Steven Moreland
ce9967834a Remove warning: vehicle RecurrentTimer_test.cpp
0xdeadbeef is exactly 32 bits, so it is interpretted as an unsigned
integer which was causing a warning. Since it's a test value, I changed
it to 0xdead which is interpretted as a signed integer.

Test: pass
Change-Id: Ibb75b23461700d77158e2337b8a472e87629ad61
2017-03-08 08:34:49 -08:00
Pavel Maltsev
4b0c5abe76 Fix static properties to comply with VTS
Test: VTS is passing

Bug: b/32021794
Change-Id: I0bc0cd98f27ec8b059df283a52fbe18d88962e35
2017-03-07 20:26:13 -08:00
Antonio Cortes
10ccd94f7f Placeholder for future implementation of VMS property in the default hal.
Test: build and flash Mojave board.
Bug: 35628104
Change-Id: I865d943b00b46ca1dd632ff3803702faec38f3f4
2017-03-07 10:51:54 -08:00
TreeHugger Robot
f410228abc Merge "Add continuous property infrastructure to VHAL" 2017-03-07 02:10:05 +00:00
TreeHugger Robot
5d6a91ccce Merge "Fix sensor event in vehicle HAL emulator" 2017-03-07 00:59:24 +00:00
Pavel Maltsev
8ab96e3874 Add continuous property infrastructure to VHAL
Implemented RecurrentTimer class that can be used in VHAL
implementations to trigger an event every X amount of time.
This make sense for continous properties.
Also added linkToDeath for VHAL listeners.

Test: unit tests added and ran

Change-Id: I4a2e0607ff6b15b3e7babbe3fbb9fff8d4e28838
2017-03-06 10:55:06 -08:00
Bryan Eyler
da0d1a1d01 Merge "Add a continuous property to default implementation." 2017-03-03 22:06:47 +00:00
Antonio Cortes Perez
bf827a9898 Merge "Post-O. Move VMS property to hal 2.1." 2017-03-03 15:11:24 +00:00
Antonio Cortes
dd1b9d395d Post-O. Move VMS property to hal 2.1.
Test: build and flash Mojave board with TARGET_USES_CAR_FUTURE_FEATURES=true.
Test: check that the property is displayed in the logs during startup.
Bug: 35628104

Change-Id: I8b5327ae255cd94ac78a0436aac06b32e3168c28
2017-03-02 15:59:51 -08:00
Pavel Maltsev
1ba0d5ee05 Fix sensor event in vehicle HAL emulator
Test: verified events are now gets propagated to CarSensorManager
(toggle day/night mode in Emulator UI)

Change-Id: Ifc4a755c5f6d31f41ab26ebc873c66c43d9e234a
Fix: b/35926101
2017-03-02 14:58:26 -08:00
Bryan Eyler
1c386b5899 Add default behavior for HVAC power
Add properties to HVAC_POWER_ON config string
Return NOT_AVAILABLE for properties in HVAC_POWER_ON config string when
power is off.

Change-Id: Icfa06aa169345e973d2e152aa6dbd8c14f3a5d17
2017-03-01 14:17:00 -08:00
TreeHugger Robot
bbcd49ad86 Merge "Add CarSensor properties to DefaultVehicleHal" 2017-02-28 20:53:47 +00:00
Steve Paik
746c89fa9b Add CarSensor properties to DefaultVehicleHal
Test:  Run python vhal_emulator_test
Change-Id: I1ebab23942397c5043840ea4ea1dc8e515f38c29
2017-02-28 10:38:36 -08:00
Steve Paik
62abcb399a Merge "Add pipe interface to DefaultVehicleHal" 2017-02-28 04:44:39 +00:00
Pavel Maltsev
15e9a8f967 Vehicle Hal 2.1: register with the default name
b/35811488

Test: verified Car Service connected to VHAL 2.1
Change-Id: I5d287b2dc71f62bba501ab872f9a14196d5dabb7
2017-02-27 17:49:37 -08:00
Steve Paik
a59644ac8e Add pipe interface to DefaultVehicleHal
- Create base communications interface
- Refactor socket calls to use SocketComm class

Test: Use python scripts and custom emulator to test communications

Change-Id: Ia401587223035e748991516a2285cc31cb71a9c9
2017-02-27 17:27:18 -08:00
Yifan Hong
4c13f2da75 Merge "Car HAL uses "default" service name" 2017-02-24 20:58:53 +00:00
TreeHugger Robot
dbd6d31f62 Merge "Move OBD2 support to Vehicle HAL 2.1." 2017-02-23 22:45:30 +00:00
Enrico Granata
7debe91a97 Move OBD2 support to Vehicle HAL 2.1.
For O-MR1.
Test: build
Bug: 34746908
Change-Id: I369e6531b8957d8e03154fdf5d732e8242a3c245
2017-02-23 13:06:41 -08:00
Chris Phoenix
018a4d47a8 Car HAL uses "default" service name
the getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: builds

Bug: 33844934

Change-Id: I1fc92a29178befc1b2232cfcc4b13058d57cd798
2017-02-22 18:47:14 -08:00
Tri Vo
d94a7d2df9 Remove .vts spec files
Test: mmma hardware/interfaces
Change-Id: Idae97ce60a6368cfa685ae6b2d71b9ad163e8605
2017-02-22 12:53:52 -08:00
TreeHugger Robot
d86b0f1f76 Merge "Make vehicle HAL 2.1 proprietary module" 2017-02-22 00:22:04 +00:00
Pavel Maltsev
59f79d0985 Make vehicle HAL 2.1 proprietary module
Bug: b/34716856

Test: make -j ; manually verified Car Service is able to connect
Change-Id: I88cbc7426cf2c41a36d970c4238e5a36d0c1f926
2017-02-21 12:57:41 -08:00
Bryan Eyler
c7f5f76bfd Merge "Remove unused OFF/MIN/MAX constants from HAL." 2017-02-18 00:55:00 +00:00
Bryan Eyler
fd03d46680 Add a continuous property to default implementation.
Just a sample.  It's supposed to be ON_CHANGE as well, but that's a much
larger change.

Change-Id: Idd8c2a8346cb78efeae3d72bab5bd9d8f36cb5f2
2017-02-17 14:49:25 -08:00
Bryan Eyler
b7387b78b8 Remove unused OFF/MIN/MAX constants from HAL.
Change-Id: I8b2b0d94872fdfcb60d2791ee14be85cccd35129
2017-02-17 14:44:43 -08:00
Pavel Maltsev
d99798219b Regenerate make files for Vehicle HAL 2.1
Test: m -j32 ; manually verified Car Service is able to connect to HAL

Bug: b/34716856
Change-Id: I544fa67181ef1d5212c6476100728edaa9aa6c7e
2017-02-16 16:55:06 -08:00
Pavel Maltsev
c5344ac04c Initial submit of Vehicle HAL 2.1
Major changes / decisions:

- created empty IVehicle@2.1 interface to distinguish HAL impls
  from client's (Car Service) perspective;
- created default 2.1 implementation that currently delegates all
  calls to existing 2.0 implementation
- had to refactor a little bit 2.0 thus components could be esily
  imported in 2.1

TOOD:
- move OBD and VMS code to 2.1
- decouple "DefaultVehicleHal.cpp"
- rename "DefaultVehicleHal" to Emulator (let's call things by their names)

b/34716856

Test: todo

Change-Id: Ib23650ca1277f0dfb24e5c789d65a19dce8b1abc
2017-02-14 16:07:11 -08:00
Zhuoyao Zhang
f008f8fdc4 Merge "Update .vts files on master based on the latest .hal file and hidl-gen" 2017-02-14 18:51:27 +00:00
Asaf Rosenfeld
ba1460f25f Merge "update vms hal index" 2017-02-14 16:45:37 +00:00
asafro
056d220bdb update vms hal index
Test: tested in VmsServiceHal tests (new test in a separate cl)
Bug: 35313387
Change-Id: I18379fed2b8e59b21cfe732e3a81f63e611cdd36
2017-02-14 00:45:42 -08:00
Zhuoyao Zhang
3bef939f94 Update .vts files on master based on the latest .hal file and hidl-gen
Test: mma
Change-Id: I9558f300505db83e26f7c241c5cf729cd005a07b
2017-02-13 18:03:06 -08:00
Steven Moreland
a0da1a1c3d Move hidl shims to the vendor partition. (2/2)
We need google shims on the vendor partition because they are providing
an implementation of a vendor defined interface. They were written by
google just as a courtesy/to make the transition easier. They're
basically a set for vendors to assemble their hal implementations
from.

Bug: 34135607
Test: marlin persist.hal.binderization on/off
Change-Id: I2e2af5af39264cf290259755bb9b2eb9827a21f5
2017-02-13 15:03:41 -08:00
TreeHugger Robot
86fa244c12 Merge "Update makefiles to use filgroup syntax." 2017-02-10 23:25:52 +00:00
TreeHugger Robot
fb75f8faac Merge "Post-O. Finalize Vehicle HAL support for OBD2 diagnostics." 2017-02-10 21:22:43 +00:00
Tri Vo
85120c9490 Update makefiles to use filgroup syntax.
Test: mmma hardware/interfaces
Change-Id: I9f4457c78b7820c242d46359f0debe05d1b3e482
2017-02-10 12:45:19 -08:00
TreeHugger Robot
2300481962 Merge "Fix warning in Vehicle HAL" 2017-02-10 19:56:25 +00:00
Pavel Maltsev
308515f65f Fix warning in Vehicle HAL
Test: mm -j

Change-Id: Ifc0654e912f3b592af90246af6d87324c469a8d3
Fix: b/34901911
2017-02-09 20:58:42 -08:00
Andreas Huber
d38f147c35 Updated makefiles
Java intermediates are now created in the common rather than the device-
specific generated sources subdirectory.

Bug: 33842609
Test: make
Change-Id: I16af4cd19bf0b24baa0ad9ebfdb86b4d959c8672
2017-02-09 17:20:45 -08:00
Enrico Granata
37e69d773b Post-O. Finalize Vehicle HAL support for OBD2 diagnostics.
Add OBD2_DTC_INFO property to VHAL. This property returns a list of timestamps for which freeze frames are available to be read.
Make OBD2_FREEZE_FRAME indexed on timestamp, such that one has to pass a timestamp to retrieve the freeze frame at that timestamp.
Add OBD2_DTC_CLEAR to delete some or all of the freeze frames stored.

Test: build
Change-Id: I30344ffd6e7527f076b3382c32f5507973c9985b
2017-02-09 17:12:12 -08:00
Steve Paik
f53dfca395 Merge "Enable vehicle HAL to be controlled via ADB" 2017-02-09 00:27:32 +00:00
Steve Paik
56c0c84dd7 Enable vehicle HAL to be controlled via ADB
Add emulator functionality to DefaultVehicleHal:

- Create default list of properties based upon DefaultConfig.h
- Add socket that is reachable via ADB to set/get vehicle properties.

BUG: 29601815
Test: Tested with Python interface from host.
Change-Id: I6f8e4cba37d927565e10797875eb8f5a1840a94f
2017-02-08 08:40:17 -08:00
Tri Vo
ce608bec74 Migrate driver/profiler to test/vts-testcase/hal.
Bug: 34893894
Test: mmma hardware/interfaces

Change-Id: Ic72716577a5f93700c5056986aff55a76b170b5d
2017-02-07 19:13:28 -08:00
Pavel Maltsev
2579fb792b Move Vehicle HAL under automotive package
Test: verified unit tests and VTS are passing

Bug: b/33200203
Change-Id: I69cc4bc0d4cbc1a6bf2f77564a8f70412fe06947
2017-02-05 16:48:12 -08:00