Commit Graph

19 Commits

Author SHA1 Message Date
Chris Kuiper
3c420b663d HalProxy: Forward 'lshal debug' options.
Bug: 262655635
Test: Temporarily added logs to verify option arguments are correctly
      forwarded.

Change-Id: Idef9b3371c332b8578cbfa88ba7d4bf4c68155e3
2022-12-14 20:46:34 -08:00
Aditya Chitnis
e61b64baf5 Adding suport for multiple multihal config files
Bug: 259450346
Test: Presubmits
Change-Id: Ic7b113e6b8bf94e0c0ffe539f965232b24bdf66d
2022-12-01 10:07:31 +00:00
Treehugger Robot
653d588e32 Merge "Remove early break for sub-HAL initialization failure" am: 6e503b7a4e am: fa9af8de75 am: 0774f2b58e am: b222bd47a3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1961241

Change-Id: I4baa7f43717bbb84cdee578dcd510b97efcd5e5e
2022-01-27 23:24:32 +00:00
Yixuan Wang
105da222fb Remove early break for sub-HAL initialization failure
Bug: 212420575
Test: none
Change-Id: I38099a4edbdeffe99ae2d91fc9dc518c9da98b13
2022-01-26 21:22:44 +00:00
Tyler Trephan
17857cc469 Updated multihal to use new sensors AIDL interface.
Test: make android.hardware.sensors@aidl-multihal
Fix: 206867060
Change-Id: I9b78a0f25117d11fdf4beb1e0913393c1c14620d
2022-01-11 21:09:17 +00:00
Xin Li
c026d3a0b6 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: If5afd00334e8b09250df1ae97dec9285e39ad930
Change-Id: Ic66bb1389f1bbecfdaa641e1fcdbf79044f55d23
2020-12-02 00:32:27 -08:00
Karthik Bharadwaj
f5572477e4 Merge "Strip hinge angle sensor when running a 2.1 HAL as 2.0" am: d3e3b877ac am: 6e8d750aa3 am: 40cf1af6fd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1498362

Change-Id: I5cd3a8b4ca6a05228cb72dbdcbe00bf6721b288f
2020-11-17 20:34:46 +00:00
karthik bharadwaj
c8fd7b31e0 Strip hinge angle sensor when running a 2.1 HAL as 2.0
VTS ensures that  2.0 HALs don't expose the hinge angle sensor,
but the 2.1 HALs must run 2.0 VTS tests. This CL ensures that
we don't expose the hinge angle sensor on the 2.0 HAL, to avoid
failing those VTS tests.

Bug: 173135479
Test: run vts -a x86 -m VtsHalSensorsV2_0TargetTest
Change-Id: I944bfb0b01be0831e45cfd3d6ed7dab6770d1b80
2020-11-16 05:21:25 +00:00
Xin Li
36dcf1a404 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I6502829205ede2de914b27e6c2c5c42916af2b39
Change-Id: I7cb06511e43bd1fffd5f80a11dbdf5b1314cfe8e
2020-08-28 13:05:04 -07:00
Treehugger Robot
1d18ec8d96 Merge "Remove unnecessary type and dup for fd" am: 5428551ba9 am: f8f2391f8e am: 667ef2c4c7 am: 6f25e95bc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12346313

Change-Id: Ib984a5a049ff3cabbf7ae7b03b5a40ceab4d973c
2020-08-26 00:52:10 +00:00
Treehugger Robot
667ef2c4c7 Merge "Remove unnecessary type and dup for fd" am: 5428551ba9 am: f8f2391f8e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1374049

Change-Id: I4151bc9aa650bbdb5545875d14760455efe62fe7
2020-08-25 22:04:45 +00:00
Anthony Stange
55a4f59fb8 Fix double release of ScopedWakelock
Today, when a ScopedWakelock is moved, the default move constructor
doesn't unlock the old wakelock instance. This results in the moved
ScopedWakelock instance decrementing the wakelock ref count which leaves
the multi-HAL out of sync from the sensor service.

Fix this by adding a custom move constructor / operator to ensure old
state is cleared on the moved instance.

Bug: 163468874
Test: Load multi-HAL and verify that it properly waits to release the
wakelock until the sensor service notifies that it has a lock held.
Test: Run unit tests

Change-Id: Ifd5a3c7596f78d7a756c4472f30efb625d670791
2020-08-11 21:43:09 +00:00
Stan Rokita
c786dfc5b1 Search for subhal .so files in additional directories
Fixes: 154634207
Test: Load onto flame and confirm that subhal .so
android.hardware.sensors@2.X-fakesubhal-config3.so loads when it is
living in the /vendor/lib64/hw directory using
adb shell lshal debug android.hardware.sensors@2.0::ISensors/default

Change-Id: I8a676b97f6f6992e8937ecf31c3b7af06e676ebb
2020-05-02 00:03:27 +00:00
Anthony Stange
33acf9fb3a V2: 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: Ie73458b3447dab80f6b692e55832ef562636bfdb
2020-04-30 08:45:19 -04:00
Nick Chalko
cd5d437ae9 Revert "Set up Multi-HAL for Sensors HAL 2.1"
Revert submission 10501254-multihal_2_1



Reason for revert: Droidcop: Potential culprit for b/155328660 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug: 155328660
Reverted Changes:
I2be51568b:Update tests for multihal to test HAL 2.1
Id5ab7b606:Create Multi-HAL 2.1 service
Icefae8c12:Set up Multi-HAL for Sensors HAL 2.1

Change-Id: I21176759d45972cde3221cb462934fc1d7bd88c2
2020-04-29 22:21:25 +00:00
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
Anthony Stange
cd4d9abdcc Don't modify -1 sensorHandle value
A -1 sensorHandle value is used to denote all active sensors should be
stopped for a given channel. Make sure the multi-HAL code doesn't modify
handles of this value or it'll corrupt them before passing to the direct
channel sub-HAL.

Bug: 153413565
Test: atest VtsHalSensorsV2_0Target
Change-Id: I3fe9cbf4661aa3db4ff534765d5112a193b7bf4a
2020-04-09 11:07:56 -04: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