Commit graph

158 commits

Author SHA1 Message Date
Anthony Stange
bc20e5c2a3 Set up Multi-HAL for Sensors HAL 2.1
Bug: 149758467
Test: Load onto device and verify VTS passes
Test: Verify new fake subhals load properly and that unit tests pass
that have been updated in this topic

Change-Id: Icefae8c1261b29d704beedd51de5b3f53b374cc4
2020-04-28 17:48:59 -04:00
TreeHugger Robot
ee01c9ec22 Merge "Adds context_hub group to sensors HAL" into rvc-dev 2020-04-09 11:55:15 +00:00
Dan Shi
aad51fa000 Rename vts-core to vts
Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL update suite name vts-core to vts as
the suite name is updated. This CL won't change test logic or behavior.

Change-Id: I562b4dc50765e953800a814a8fd84a01c1b9352b
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-04-07 16:37:40 -07:00
Rick Chen
cdc9be8c7d Adds context_hub group to sensors HAL
Bug: 152005392
Bug: 152727489
Test: Compile pass. Verify sensor function.
Signed-off-by: Rick Chen <rickctchen@google.com>
Change-Id: Ifd7b9239a732619307bbb2e99d37791915fe7dc1
2020-04-07 22:51:13 +08:00
Anthony Stange
f1d431f634 Add SubHal header for Sensors HAL 2.1
Bug: 149758467
Test: compile
Change-Id: Id10d20e5d24571572565ac5d968f265ef7d7070f
2020-03-19 18:11:28 -04:00
Anthony Stange
05d7496e4c Move Multi-HAL 2.0 to the common directory
Sensors Multi-HAL 2.0 will soon have a shared implementation for both
Sensors HAL 2.0 and 2.1 and moving the files to the common directory
first will minimize the diff in upcoming CLs.

Bug: 149758467
Test: compile
Change-Id: I15f84a7aaa302d83d4f4b1ffe357f515e36d6382
2020-03-04 15:09:58 -05:00
Stan Rokita
14499028cf HalProxy unit test to expose incorrect numEventsOnPendingQueue
Bug: 147912609
Test: run unit test
Merged-In: Ia6fe3cafc1c2adb02463c28481bcf4c723551860
Change-Id: Ia6fe3cafc1c2adb02463c28481bcf4c723551860
2020-03-04 14:56:07 -05:00
Stan Rokita
d5d021b380 Build HalProxy unit tests with a test library ScopedWakelock
Unit tests do not currently build because they cannot find the
ScopedWakelock shared object. Make a test library version of
ScopedWakelock for them.

Bug: 147912609
Test: Build and run atest android.hardware.sensors@2.0-halproxy-unit-tests
Merged-In: Ie8d3eb606ccba3825be2c8102b9a7bc6ea033f65
Change-Id: Ie8d3eb606ccba3825be2c8102b9a7bc6ea033f65
2020-03-04 14:55:59 -05:00
Anthony Stange
e49ee681b0 Move common tests into SensorsV2_0 VTS only
Since Sensors HAL 2.1 implementations need to run VTS for both HAL 2.0
and 2.1, move tests that don't differ in logic between the two HAL
implementations to the VTS for 2.0 only to minimize the total run time
for both suites.

Bug: 149927057
Test: atest VtsHalSensorsV2_0Target VtsHalSensorsV2_1Target
Change-Id: I5213cdf05bafb2d4014078a03b22d98b96b7c5ee
2020-03-02 15:25:12 -05:00
Anthony Stange
aef69c9538 Create separate VTS target for Sensors HAL 2.1
Dependencies don't use cflags set by code that depends on them so the
VTS test for HAL 2.1 wasn't properly pulling the 2.1 interface when
present on the device (it was using the 2.0 interface). Modify the
Android.bp files to define the right flags depending on whether we're
testing HAL 2.0 or 2.1.

Bug: 149759782
Test: atest VtsHalSensorsV2_0TargetTest VtsHalSensorsV2_1TargetTest
Change-Id: I3533b6c244e767a8defe0a44a14025fdeb8eeeba
2020-02-19 12:47:50 -05:00
Anthony Stange
a9a5eb411e Add VTS tests for Sensors HAL 2.1
Bug: 144139857
Test: atest VtsHalSensorsV2_0TargetTest VtsHalSensorsV2_1TargetTest
Change-Id: If2b751929b8d89c9d381032f5e8424a24719b6bd
2020-02-18 17:45:02 -05:00
Anthony Stange
1d71acc129 Add default impl of Sensors HAL 2.1
Create a default implementation of HAL 2.1 that shares 90% of the
underlying code with HAL 2.0 since the interfaces are very similar.

Bug: 144139857
Test: compile
Change-Id: Ic6b139df98ddb1f92833b1f2d65e1cecc297fd41
2020-02-18 15:24:35 -05:00
Automerger Merge Worker
f20dd169e2 Merge "Fix formatting errors in sensors MH2 bp files" am: 30fc7d4ba3 am: 59c1adabc7 am: 217167bf87
Change-Id: I55b5eebb64c27f3559de3badf139f0efdf35e458
2020-02-05 01:08:52 +00:00
Automerger Merge Worker
14edbe86dd Merge "Remove reference of VtsHalHidlTargetTestBase" am: badb75e309 am: 88b5b44f89 am: 4eaa7205f8
Change-Id: Ie3eb4abb16005f5a8d137ce800dcc8e21e32b5e8
2020-02-05 00:23:34 +00:00
Treehugger Robot
30fc7d4ba3 Merge "Fix formatting errors in sensors MH2 bp files" 2020-02-05 00:23:26 +00:00
Stan Rokita
4820138e21 Fix formatting errors in sensors MH2 bp files
Test: build

Change-Id: Idb00ed68c9805a055bf87560f02605920c4149e5
2020-02-04 16:01:44 -08:00
Dan Shi
badb75e309 Merge "Remove reference of VtsHalHidlTargetTestBase" 2020-02-04 23:44:04 +00:00
Dan Shi
9910d38aa7 Remove reference of VtsHalHidlTargetTestBase
Bug: 147894326
Test: m -j VtsHalWifiHostapdV1_0TargetTestUtil \
  VtsHalSensorsTargetTestUtils
Change-Id: If11f23db93333ddd702ce5ebf7c5c0b9583c57fa
2020-02-04 03:29:50 +00:00
Automerger Merge Worker
11b3d6ecdf Merge "[Sensors MH2] Keep track of most events seen on pending queue" am: b2e4c01a76 am: ec3f43a767 am: dd2b347ca0
Change-Id: I48beab8e0bb822cc7e97328bd36a76b9d676803c
2020-02-04 00:01:30 +00:00
Stan Rokita
e7f293621e [Sensors MH2] Keep track of most events seen on pending queue
Bug: 148243746
Test: Load onto device and run
'adb shell lshal debug android.hardware.sensors@2.0::ISensors/default'
to observe correct output

Change-Id: I8f7d87e86860bbca229051fec35b7048c4b3268b
2020-02-03 13:41:56 -08:00
Automerger Merge Worker
c56cf74d72 Merge "Fix the format specifier in assert log statements" am: ddc10d848a am: 1ffb992d29 am: 7ab599b97c
Change-Id: I2dff3d4a75f8f8f7c6f5ba3074f9324cd6307a3d
2020-01-25 01:15:04 +00:00
Treehugger Robot
ddc10d848a Merge "Fix the format specifier in assert log statements" 2020-01-24 23:21:11 +00:00
Stan Rokita
010c36d22d Fix the format specifier in assert log statements
There are two ALOG_ASSERT calls in the HalProxyCallback::postEvents
method that do not have the correct format specifier types. This causes
a build error if you try to build with debug logs.

Test: Build and load onto device
Change-Id: I793b6fcd72dd13b07422af0e292a373a66b2c200
2020-01-21 15:38:36 -08:00
Automerger Merge Worker
e91b85631f Merge "Decrement size of pending write queue by correct amount" am: 79fc8d0212 am: b492ac69b5 am: 0cf13f7ded
Change-Id: I555d97575c9f4780bc4edcd46ba4cad0b2ff64ef
2020-01-17 21:38:00 +00:00
Stan Rokita
bc0b20ad1f Decrement size of pending write queue by correct amount
The pending write events vector is destructed before using its size to
decrement the number of events on the pending write events queue which
may cause the value decrement by 0 instead of the actual number of
events removed.

Bug: 147686560
Test: Build and load onto device with fake subhals
Change-Id: I7b6c6231eacfa89b0dd55bc405b235d34be5ff46
2020-01-15 08:29:17 -08:00
Automerger Merge Worker
467d0220e4 Merge "Convert VtsHalSensorsV*_0TargetTest to be parameterized." am: c81f9c9958 am: 6887dc320d am: 6d3e344091
Change-Id: Icbdcf15a369e4263e622c08c8427ac100c6e1c0c
2019-12-11 00:44:35 +00:00
Dan Shi
395288173d Convert VtsHalSensorsV*_0TargetTest to be parameterized.
Bug: 142397658
Test: atest VtsHalSensorsV1_0TargetTest VtsHalSensorsV2_0TargetTest
Change-Id: I76bf0b68abf8c8a1c79afabbc26242e33778bd25
2019-12-09 10:10:44 -08:00
Stan Rokita
655675db00 Make ScopedWakelock a shared library am: 1d53f9563b am: 1e9bac4b58
am: b0af4f5a25

Change-Id: I641b4d611e8b9637f07fda2592d3d078dc82a677
2019-11-25 14:37:40 -08:00
Stan Rokita
1d53f9563b Make ScopedWakelock a shared library
Change the build configuration of multihal and its tests to make the
ScopedWakelock.cpp file and its associated headers available as a
library to be included by the fake subhals and the multihal binary
seperately.

Bug: 144722764
Test: Compiled and loaded onto device without issue
Change-Id: Ide83b6761302c5df6c72bc3202727341361b36ed
2019-11-25 12:36:10 -08:00
Stan Rokita
dda3a5c7c4 Merge "Change instance name to default in multihal 2 xml" am: 724b7471e0 am: c3f2745aae
am: eba6d2429a

Change-Id: Ifbbabaee01f39c79f395408c2d29764541ce8e46
2019-11-19 08:30:03 -08:00
Treehugger Robot
724b7471e0 Merge "Change instance name to default in multihal 2 xml" 2019-11-19 16:15:08 +00:00
Stan Rokita
a1ed22e34f Change instance name to default in multihal 2 xml
Bug: 144722764
Test: N/A
Change-Id: Ic6b4a4f5ccb8df11ac8ed819fd750841373bc11f
2019-11-18 15:09:00 -08:00
Stan Rokita
57ed4c98c3 Merge "Bound pending write events queue to avoid OOM" am: 6cbd36f357 am: 797b06e220
am: ac564f2899

Change-Id: I09b08508fd3cf53381d524613dad63621eb63595
2019-11-05 11:11:16 -08:00
Stan Rokita
5098f0a9ca Bound pending write events queue to avoid OOM
Bound the pending write events queue to a large amount of events in
total (100,000) so that we do not have out of memory crashes when the
sensors framework locks up. Events are 80B of memory each. So this
change caps are pending writes event queue to 8MB of memory.

Bug: 143302327
Test: atest android.hardware.sensors@2.0-halproxy-unit-tests &&
vts-tradefed run commandAndExit vts --skip-all-system-status-check
--primary-abi-only --skip-preconditions --module VtsHalSensorsV2_0Target

Change-Id: I5d0a7f382e3f61fbbe2c74b5c9cf13560432b84c
2019-11-04 14:33:06 -08:00
Stan Rokita
e210b0b012 Merge "Add Sensors Multihal support for Hal 2.0" am: 2f27f7137e am: 2d399b5af0
am: 4950a9dc21

Change-Id: I87376735901a4477d901ef87bcecc3b6146f12b4
2019-10-31 09:15:20 -07:00
Treehugger Robot
2f27f7137e Merge "Add Sensors Multihal support for Hal 2.0" 2019-10-31 15:32:44 +00:00
Stan Rokita
94e44b5764 Revert sensors multihal 2.0 changes temporarily.
Revert the changes that added multihal support to sensors HAL 2.0 while
waiting for merge from the same changes added to AOSP.

07b442e96 (refs/published/mh2_2) MH2 | Write processedEvents instead of
original events.
b38f2e251 Merge "MH2 | Check that subhal index is in range"
d38f99474 Merge "MH2 | Implement debug method of HalProxy"
bf46132fe (refs/published/mh2_4, mh2_4) MH2 | Implement debug method of
HalProxy
1de5bb334 MH2 | Fix wakelock name
e07215347 (refs/published/mh2_3, mh2_3) MH2 | Check that subhal index is
in range
336c1c71e MH2 | Add restart logic in HalProxy::initialize method.
731d7125b MH2 | Change rc file to more appropriate settings
f09465d11 MH2 | Add makeFMQ helpers to HalProxy_test
75cc7bf2f MH2 | Implement wakelock processing thread
e93fdf9a4 MH2 | Implement dynamic sensors callbacks on HalProxy
82b84148c Remove libhwbinder/libhidltransport deps
d45e49b4b Merge "MH2 | Implement pending writes thread"
597142692 MH2 | Implement pending writes thread
db23aa825 MH2 | Implement direct channel and direct report methods
83e4370ae MH2 | Implement injectSensorData method of HalProxy
d0cd57d4c MH2 | Implement ScopeWakelock ctor and dtor
537c0274b MH2 | Add rough proxy callback postEvents method
f97a3f357 Multihal 2.0 - Small tweaks to sensorHandle handling
7a7235461 MultiHal 2.0 - setOperationMode and init direct channel flags
dc7a8e789 MultiHal 2.0 - Get sensors list from subhals
4b4c7b744 MultiHal 2.0 - activate, batch, flush methods of HalProxy
1638531df MultiHal 2.0 - proxying api calls helper methods
aacbf9485 Set up shell to use for unit tests
2879067dd Multihal 2.0 - Implement SubHal discovery
c34e6683b Add a sub-HAL implementation for testing multi-HAL
a689f8a65 Add skeleton for multihal 2.0

Bug: 136511617
Test: N/A
Change-Id: Ic3588f42cf60aee6ca915be19b834462aeb7a95c
2019-10-29 13:59:50 -07:00
Stan Rokita
2e37ec4475 Add Sensors Multihal support for Hal 2.0
The multihal framework is a HAL interface for the sensors framework that
allows multiple vendors to package their HAL implementation into a
subHAL dynamic library that will be loaded and used to pass on method
calls to the appropriate subHAL. The HalProxy object, that will act as
the main proxy sensors wrapper for the multiHAL handles writing sensor
events to the event FMQ and wakelock acquisition and releasing via a
callback object it passes to the subHALs.

In order to turn your HAL 2.0 executable into a subHAL to be used by the
multiHAL, implement the Return<Result> initialize(sp<HalProxyCallback>&
callback) method of the ISensorsSubHal derived class. Implement the
ISensorsSubHal* sensorsHalGetSubHal(uint32_t* version)method and have it
return a pointer to your subHAL object. Build this into a dynamic
library and list its filename under /vendor/etc/sensors/hals.conf.

Squashed commits:

07b442e96 (refs/published/mh2_2) MH2 | Write processedEvents instead of
original events.
b38f2e251 Merge "MH2 | Check that subhal index is in range"
d38f99474 Merge "MH2 | Implement debug method of HalProxy"
bf46132fe (refs/published/mh2_4, mh2_4) MH2 | Implement debug method of
HalProxy
1de5bb334 MH2 | Fix wakelock name
e07215347 (refs/published/mh2_3, mh2_3) MH2 | Check that subhal index is
in range
336c1c71e MH2 | Add restart logic in HalProxy::initialize method.
731d7125b MH2 | Change rc file to more appropriate settings
f09465d11 MH2 | Add makeFMQ helpers to HalProxy_test
75cc7bf2f MH2 | Implement wakelock processing thread
e93fdf9a4 MH2 | Implement dynamic sensors callbacks on HalProxy
82b84148c Remove libhwbinder/libhidltransport deps
d45e49b4b Merge "MH2 | Implement pending writes thread"
597142692 MH2 | Implement pending writes thread
db23aa825 MH2 | Implement direct channel and direct report methods
83e4370ae MH2 | Implement injectSensorData method of HalProxy
d0cd57d4c MH2 | Implement ScopeWakelock ctor and dtor
537c0274b MH2 | Add rough proxy callback postEvents method
f97a3f357 Multihal 2.0 - Small tweaks to sensorHandle handling
7a7235461 MultiHal 2.0 - setOperationMode and init direct channel flags
dc7a8e789 MultiHal 2.0 - Get sensors list from subhals
4b4c7b744 MultiHal 2.0 - activate, batch, flush methods of HalProxy
1638531df MultiHal 2.0 - proxying api calls helper methods
aacbf9485 Set up shell to use for unit tests
2879067dd Multihal 2.0 - Implement SubHal discovery
c34e6683b Add a sub-HAL implementation for testing multi-HAL
a689f8a65 Add skeleton for multihal 2.0

Bug: 136511617
Test: atest android.hardware.sensors@2.0-halproxy-unit-tests &&
vts-tradefed run commandAndExit vts --skip-all-system-status-check
--primary-abi-only --skip-preconditions --module VtsHalSensorsV2_0Target

Change-Id: Ibe92d40c92b70848526b0e941bbcffbaf81ffaf2
2019-10-29 11:08:38 -07:00
Stan Rokita
07b442e96c MH2 | Write processedEvents instead of original events.
Fix bug where the HalProxyCallback::postEvents method was passing the
unaltered events vector to HalProxy::postEventsToMessageQueue instead of
the processedEvents with altered sensorHandles. Add a unit test to test
that the proper sensorHandles are seen compared to the event posted from
subhal.

Additionally, fix problems with fake subhals and their dummy sensors
that allows VTS tests to pass all tests.

Bug: 136511617
Test: New unit tests pass and VTS tests under module
VtsHalSensorsV2_0Target passing.
Change-Id: If30da03a2399666700844523cd1104b07f6b65d2
2019-10-24 13:31:19 -07:00
TreeHugger Robot
b38f2e2513 Merge "MH2 | Check that subhal index is in range" 2019-10-21 20:06:21 +00:00
TreeHugger Robot
d38f994742 Merge "MH2 | Implement debug method of HalProxy" 2019-10-19 00:06:01 +00:00
Stan Rokita
bf46132fe5 MH2 | Implement debug method of HalProxy
Bug: 9569382
Test: Observed debug output from
$ adb shell lshal debug android.hardware.sensors@2.0::ISensors/default
Change-Id: I9f2627a05d37bd8407a22e263b7557834a9677b8
2019-10-18 14:50:36 -07:00
Stan Rokita
1de5bb334c MH2 | Fix wakelock name
Name is supposed to be "SensorsHAL_WAKEUP".

Bug: 142505817
Test: N/A
Change-Id: I79f01509bffba499678fa519d038db37e2a9efbd
2019-10-18 14:23:16 -07:00
Stan Rokita
e072153474 MH2 | Check that subhal index is in range
For each HalProxy method that takes in a sensorHandle, the code now
checks that the subhal index byte (first byte) of the handle is the
range of subhals in list before indexing into mSubHalList so that are
crash does not occur and returns Result::BAD_VALUE if that is the case.
Add unit tests to assert that error is returned. Also change the methods
that accept sensorHandles to int32_t type since that is the actual type
defined in the HAL spec.

Bug: 136511617
Test: Passing new unit tests.

Change-Id: I5489e999bc5eaef1a21698bdbc0a0341bc88194c
2019-10-18 12:12:47 -07:00
Stan Rokita
336c1c71e2 MH2 | Add restart logic in HalProxy::initialize method.
Bug: 136511617
Test: None yet

Change-Id: I389a7243d3612586aae4e8a802afda92af8dcc6d
2019-10-17 14:59:47 -07:00
Stan Rokita
731d7125bf MH2 | Change rc file to more appropriate settings
Bug: 136511617
Test: N/A
Change-Id: I23db5a299e5419156c3cb59fad9ea086ac2f393d
2019-10-16 09:39:50 -07:00
Stan Rokita
f09465d111 MH2 | Add makeFMQ helpers to HalProxy_test
Bug: 136511617
Test: Ran the tests with success.
Change-Id: Ide35e39529193696f3fb8d5898e9a3daf15b1630
2019-10-16 09:39:50 -07:00
Stan Rokita
75cc7bf2fe MH2 | Implement wakelock processing thread
Bug: 136511617
Test: Unit tests cannot be written for this change. Integration testing
will be performed later.

Change-Id: I651b5fde77c6017b3270413de896a947d95ff5f8
2019-10-16 09:39:47 -07:00
Stan Rokita
e93fdf9a4a MH2 | Implement dynamic sensors callbacks on HalProxy
Additionally, have HalProxyCallback::processEvents use
HalProxy::setSubHalIndex static method instead of its own helper.
Add unit tests to test the dynamic sensor methods.

Bug: 136511617
Test: New unit tests are passing.
Change-Id: Ib903291a83df2fafa480082f9305c594bd325f79
2019-10-10 16:56:21 -07:00
Steven Moreland
82b84148c7 Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I878a4d04e65ef13f3a0ebaf64177f673958d213c
2019-10-02 12:50:29 -07:00