Commit graph

333 commits

Author SHA1 Message Date
Xin Li
15be13ea71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: Ia07db5c8afeed7fe22a2b18d867a38390f910a81
Merged-In: Ibbd540dbb5baee46360d3fe9469212cfd8f550ba
2019-09-08 13:06:54 -07:00
Steven Moreland
b3a4d3832e Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I075670b64eebbbbd6a6ae0e84ad51bf1c6f5ba36
2019-09-06 01:07:02 +00:00
Brian Duddie
bab0c7efe3 Merge changes from topic "c2f2_sensors_vts" into qt-r1-dev
am: 8813be6341

Change-Id: Ie652236cdbd4734dc723fac8c27ca876161f623d
2019-08-02 19:40:55 -07:00
Anthony Stange
86063dc8da Change expected return type in direct report VTS
am: 4bdd8fc774

Change-Id: I7b313096992aa15f34a408fbed67b02e74060d5f
2019-08-02 19:40:49 -07:00
Brian Duddie
1eee061c84 Add support for new gralloc HAL versions
am: df6e2b70ae

Change-Id: Iea28b01046e9094a28d538119e5acdf845385f6f
2019-08-02 19:40:42 -07:00
Vishal Agarwal
7af073c790 Merge "VTS Sensor HAL 2.0: Fix Batch for One Shot sensors" into qt-r1-dev
am: effdb89c97

Change-Id: Ie3fa0c0a3a02e58d88ecc6971ca8bb744c005103
2019-08-02 19:40:33 -07:00
TreeHugger Robot
8813be6341 Merge changes from topic "c2f2_sensors_vts" into qt-r1-dev
* changes:
  Fix handling of reportToken when stopping
  Change expected return type in direct report VTS
  Add support for new gralloc HAL versions
2019-08-03 02:32:32 +00:00
TreeHugger Robot
effdb89c97 Merge "VTS Sensor HAL 2.0: Fix Batch for One Shot sensors" into qt-r1-dev 2019-08-03 02:32:32 +00:00
Andrew Lehmer
2e3eceded7 Fix assumptions in SensorsHidlTest.NoStaleEvents
am: d8b212ec3e

Change-Id: I039f346605006576c7854de75d4d57b0aac08324
2019-08-02 17:33:35 -07:00
Brian Duddie
63d4f57976 Fix handling of reportToken when stopping
VTS should ignore the reportToken returned by configDirectReport when it
passes in RateLevel::STOP.

Bug: 138758242
Test: run direct channel tests on device using 2.0 HAL
Change-Id: I07e789157e051ceab488a61e856f17d50f435072
2019-08-02 15:16:45 -07:00
Anthony Stange
4bdd8fc774 Change expected return type in direct report VTS
If a sensor doesn't support a particular memory type for direct
reporting, then registerChannel will return an invalid channel handle.
When this handle is used in configureDirectReport, it will return
BAD_VALUE and when used in unregisterDirectReport, it will return OK.
Currently, the VTS tests assert it will return INVALID_OPERATION, but
that will only happen if the entire HAL doesn't support direct
reporting instead of a single sensor not supporting a certain memory
type.

Bug: 138758242
Test: Run VTS and verify DirectChannel* tests now pass
Change-Id: Ifba4262b68ec0c4ca6921dad40a03e0a52088d28
2019-08-02 15:08:30 -07:00
Vishal Agarwal
66d8297210 VTS Sensor HAL 2.0: Fix Batch for One Shot sensors
One Shot sensors have minDelay set to -1. Force the minDelay to be 0 in
the VTS test to avoid errors from invalid parameter

Bug: 138758242
Test: Run Batch test manually VtsHalSensorsV2_0TargetTest --gtest_filter=SensorsHidlTest.Batch
Change-Id: Ib2287f6f11502c10d346f5e7216c5f31d585edf9
2019-08-02 14:03:41 -07:00
Andrew Lehmer
d8b212ec3e Fix assumptions in SensorsHidlTest.NoStaleEvents
This test was making a couple of false assumptions which were causing it
to fail. The fixes are related to the following assertions:
  1. One-shot sensors do not report an initial event.
  2. Special sensors may not report an initial event.
  2. Some on-change sensors may not report an initial event.
The test now only checks for a stale event if the sensor reports an
initial event consistently.

Bug: 138758242
Test: ran on C2 DVT; only fails due to an improperly configured sensor
Change-Id: I83f0cb2f6e878244f3d94ae77f64bb8ed2f78e0b
2019-08-02 14:01:57 -07:00
Brian Duddie
df6e2b70ae Add support for new gralloc HAL versions
As VTS connects to the IMapper and IAllocator HALs directly, it needs to
handle the case where the device only supports the newer HAL versions,
which includes IMapper 2.1 & 3.0 and IAllocator 3.0.

Since sensors VTS uses the same functionality from the different HAL
versions, condense the code into a common interface with HAL
version-specific template instantiation. Also remove the unused code
that came along with copying from the gralloc VTS reference source.

Bug: 138758242
Test: run gralloc-related sensors VTS on Pixel 2+
Change-Id: I1646d8f92546623594af8541bc8ac02955370694
2019-08-02 12:07:39 -07:00
Anthony Stange
1cc1242cbe Merge "Fix wait_for timestamps in Sensors VTS" into qt-r1-dev
am: 29c8337d89

Change-Id: I781d960f513045bdf46e8ee6e2f613e8e0f5aa8a
2019-07-29 15:45:41 -07:00
Anthony Stange
4a80e231ed Fix wait_for timestamps in Sensors VTS
Previously, NoStaleEvents was treating any timestamps it dealt with as
if they were in microseconds, but sensors.minDelay is in microseconds
and Event timestamps are in nanoseconds. This uses std::chrono helpers
to ensure the correct time is used when deciding how long to sleep
during the test so that if waitForEvents never passes, the test doesn't
time out.

Bug: 136736906
Test: Run VTS and verify VtsHalSensorsV2_0Target doesn't finish as an
    incomplete module.

Change-Id: Ibba59dbf9312f97d7275e5aa8cd36547ab09e328
2019-07-29 14:40:20 -04:00
Anthony Stange
ce98cb7938 Verify mPollThread is joinable before detaching am: 65945cfb15
am: f75cf1cf4d

Change-Id: I8282d67898fffa2efff979250b10dde842511daa
2019-07-15 18:12:24 -07:00
Anthony Stange
f75cf1cf4d Verify mPollThread is joinable before detaching
am: 65945cfb15

Change-Id: Iee183865223aa993241c19924245177b3462d4da
2019-07-15 17:50:18 -07:00
Anthony Stange
65945cfb15 Verify mPollThread is joinable before detaching
If HidlSetUp() bails before startPollingThread() is called (which can
happen if the HAL isn't implemented on the given device), mPollThread
will initialize with the default constructor resulting in joinable()
returning false which means calling detach() throws an exception.

Checking joinable() before detaching allows the test suite to be skipped
successfully.

Fixes: 136736906
Test: Run vts-tradefed on VtsHalSensorsV1_0Target and verify that it is
    skipped successfully on a device that doesn't support HAL 1.0

Change-Id: Ie685ae2dc314edb8df2f3cc7112141a2f5e46008
2019-07-15 19:17:25 +00:00
Felix
bf481c99ed Merge "Add interface info to .rc files" am: 98d0f4d52c am: 37298a7616
am: 3531ec0183

Change-Id: I9a48f01064e6b64fdbd3dcae3623163a27998703
2019-07-08 12:42:48 -07:00
Felix
3531ec0183 Merge "Add interface info to .rc files" am: 98d0f4d52c
am: 37298a7616

Change-Id: Ib279bd04cbdf030104d077b9a2a836a348322476
2019-07-08 12:31:38 -07:00
Felix
37298a7616 Merge "Add interface info to .rc files"
am: 98d0f4d52c

Change-Id: Ie6cfbacd523c4b09f77bee3369ec8e88b3fa0419
2019-07-08 12:22:23 -07:00
Anthony Stange
80a247e090 Merge "Deactivate sensors after flush events are received" into qt-dev
am: 8913d1df2c

Change-Id: Ie32a5d1c5f1308060af6ae8c3b7d4c25ebdc9301
2019-07-02 15:14:45 -07:00
Anthony Stange
2ff09083af Merge "Deactivate sensors after flush events are received" into qt-dev am: 8913d1df2c
am: 9ca9db61f8

Change-Id: I4e3f088897dd557e92191bccb5b46288ecf40806
2019-07-02 15:14:18 -07:00
Anthony Stange
9ca9db61f8 Merge "Deactivate sensors after flush events are received" into qt-dev
am: 8913d1df2c

Change-Id: I74b279c6e4b26429c3868fac3e9ca9e0327af202
2019-07-02 14:44:12 -07:00
TreeHugger Robot
8913d1df2c Merge "Deactivate sensors after flush events are received" into qt-dev 2019-07-02 16:28:53 +00:00
Anthony Stange
4d90400985 Deactivate sensors after flush events are received
The VTS flush test case was previously deactivating sensors before
waiting for flush events to be received causing any pending flush events
to be discarded per the HAL contract.

Bug: 136472044
Test: Run test and ensure it passes
Change-Id: I23b94e650c6dbbc33640768bee356a49565ba753
2019-07-01 21:29:01 +00:00
Felix
551b8d15ce Add interface info to .rc files
Signed-off-by: Felix <google@ix5.org>
Change-Id: I6d70bbdb66c3dce280bf6908c3750316a6f6cf70
2019-06-25 20:00:07 +02:00
Brian Duddie
b828e7bc48 Avoid NPD when re-initializing HAL fails
am: bd109b9374

Change-Id: Ibe5e262b89dc2f9645ee44bc084265164cd57827
2019-06-20 18:05:25 -07:00
Brian Duddie
62a0c5bae9 Fix NPD in GrallocWrapper
am: ccbcaaee45

Change-Id: Id9cc57ee5f9bfbabb64285671a23b6b9dbfc7b69
2019-06-20 18:05:22 -07:00
Brian Duddie
06ef2015ee Fix log tag for sensors VTS tests
am: 56d64faff7

Change-Id: I5e2c3e8aca8133fde1d26c0615b9245d54a76f43
2019-06-20 18:05:18 -07:00
Brian Duddie
bd109b9374 Avoid NPD when re-initializing HAL fails
If the sensors HAL crashes or errors out during a test where we manually
re-run the environment setup function (e.g.
CleanupConnectionsOnInitialize), the pointer to the interface will
become null. Avoid dereferencing it by checking for nullness in the
per-test setup function and after each manual setup call. Also add a
death recipient to help identify instances where the HAL crashes during
a test.

Bug: 135638664
Test: run VTS on device where HAL crashes during above mentioned test
Change-Id: Iff7aa159c6b859272cfd18e7efb3ca431ea214fc
2019-06-20 13:36:43 -07:00
Brian Duddie
ccbcaaee45 Fix NPD in GrallocWrapper
Avoid dereferencing null if mapper service is not available.

Bug: 135638664
Test: run VtsHalSensorsV2_0TargetTest
Change-Id: I3cf2a9f152d8f1737cb5a94356e252d54156c716
2019-06-20 13:36:43 -07:00
Brian Duddie
56d64faff7 Fix log tag for sensors VTS tests
Define log tag at build level to ensure all libraries have a tag
defined.

Bug: 135638664
Test: run VtsHalSensorsV2_0TargetTest
Change-Id: I593055b59238e9fa8dead00a3dafa84c00e90ec4
2019-06-20 13:36:43 -07:00
Brian Duddie
6834c2da4f Merge "Notify HAL when events are read" into qt-dev am: be19a50010
am: 2f0cedfad1

Change-Id: I5970e4b104e7d227ec50afe1207d5f392bebba65
2019-06-19 16:05:29 -07:00
Brian Duddie
45668158f5 Merge "Notify HAL when events are read" into qt-dev
am: be19a50010

Change-Id: I1339c37d0a28fd056afbc3f2ce1634bfbb60a955
2019-06-19 15:44:11 -07:00
Brian Duddie
441842e38e Notify HAL when events are read
As defined in the HAL specification, the client of the HAL (framework or
VTS) needs to set the EVENTS_READ flag when it fetches samples out of
the FMQ, to support blocking write mode.

Bug: 135442877
Test: run VTS on a device supporting HAL 2.0
Change-Id: Ic7755e869b999b638086275e4e579a84600be314
2019-06-19 02:14:51 +00:00
Brian Duddie
ffe139e47c Merge "Add guidance for avoiding race in Sensors HAL 2.0" into qt-dev
am: 5c654f3fc6

Change-Id: I4720ca0dd2ec1c30b234fdf61aa6a3430ddd7a3e
2019-06-18 17:23:24 -07:00
Brian Duddie
a69036fbfe Add guidance for avoiding race in Sensors HAL 2.0
Bug: 135216821
Test: n/a, comment change only
Change-Id: Iad491c5e221c86a2724d4074ac645b8ee6e9af6f
2019-06-15 00:49:05 +00:00
Brian Duddie
0e70902d34 Fix null deref in sensors 2.0 VTS teardown
am: b6b28e58c4

Change-Id: I98288c2bea54fdbb7e733913ccba839817b7217a
2019-06-11 14:08:02 -07:00
Brian Duddie
b6b28e58c4 Fix null deref in sensors 2.0 VTS teardown
Avoid attempting to clean up resources that were never initialized, e.g.
if the target device doesn't support the version of the HAL in question.

Fixes: 134911861
Test: run VtsHalSensorsV2_0Target on device that only supports HAL v1.0
Change-Id: I6b529fae13b1347d533a19e04f1c7748bcda961b
2019-06-11 17:43:22 +00:00
Pierre Fite-Georgel
ba7ccb21f7 Clarify documentation for AINFO_SENSOR_PLACEMENT
am: 26c952bf61

Change-Id: Id3e7df67de64fb34f5139c4626760238d275efa7
2019-05-29 13:45:06 -07:00
Pierre Fite-Georgel
26c952bf61 Clarify documentation for AINFO_SENSOR_PLACEMENT
Specify units of location vector and define the direction of the
rotation matrix translation as Android device frame to local sensor
frame.

Fixes: 133264933
Test: n/a, comment update only
Change-Id: I76dae7a6fae3c8f44a4dcd1fcc6b790abff86420
2019-05-29 09:07:52 -07:00
Steven Moreland
99712c08cc Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I53e5bf67a0d314e1b10c0ba0c7172a7af358ddcc
2019-04-18 18:13:05 -07:00
Steven Moreland
6d494b2346 Merge "Update hidl makefiles for bpfmt" am: ff0bd741ca
am: 96f40f7b02

Change-Id: Idbf030e4993067bdb8181321bca2de00c9b6f7ef
2019-04-18 14:34:45 -07:00
Steven Moreland
1ae4615d9f Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I1f69d292bc23a7cc293a66110cb02d597e1019ad
2019-04-17 09:38:50 -07:00
Brian Stack
565cb9d2f0 Rename init script for Sensors 2.0 Mock Service
Bug: 129562840
Test: Builds
Change-Id: I4744a8e00657f39010d5e2a39fe38d13813e6439
2019-03-29 15:21:27 -07:00
Steven Moreland
87f43604b9 Merge "Update makefies: no 'types' internal" 2019-03-05 17:40:03 +00:00
Steven Moreland
7f4e21adda Merge "Update makefies: no 'types'" am: 4ee5ec1469 am: bab622f6a6
am: 7224bc9bcf

Change-Id: I434939e0770afa436c532a945542fce30a71ef7d
2019-03-04 16:05:59 -08:00
Steven Moreland
b91ac5c6a0 Update makefies: no 'types' internal
Bug: 123976090
Test: N/A
Change-Id: I84b659b163b63d39535b462a3df8a9c19f680976
2019-03-04 14:09:25 -08:00