Commit graph

505 commits

Author SHA1 Message Date
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
TreeHugger Robot
81259af583 Merge "Fix double release of ScopedWakelock" into rvc-qpr-dev am: 74896bed49
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12351750

Change-Id: I2478bae593f72eec1f9722675226c39712aa306a
2020-08-12 14:40:42 +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
Dan Shi
e5c9b5e722 Suppress gtest error for tests without any instance am: ba4d532fee am: 73122cd284
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1374050

Change-Id: Ie5e956d4613f5e947c36ba4f1048f0c3aa8944ba
2020-07-29 05:45:58 +00:00
Dan Shi
ba4d532fee Suppress gtest error for tests without any instance
Bug: 162052785
Test: m -j vts
Change-Id: I8c1a48e6fbd7c8161137902b5332911fa0d7b8b3
2020-07-28 15:12:32 -07:00
Jooyung Han
d610435ac4 update hidl .bp
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
(cherry picked from commit b0907a6bb8)
2020-07-07 16:22:36 +09:00
Jooyung Han
d18cba85fe update hidl .bp
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
(cherry picked from commit b0907a6bb8)
2020-07-02 12:26:37 +09:00
Brian Duddie
35a1cb8e00 Add support for IAllocator/IMapper v4.0 in sensors VTS am: 97f1a3aeaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11744993

Change-Id: Ia66309472684ff6552884ddd2ef0de8d1bd9a1bd
2020-06-05 14:38:42 +00:00
Brian Duddie
97f1a3aeaa Add support for IAllocator/IMapper v4.0 in sensors VTS
Also, pull in the static libs associated with the graphics HALs to
VtsHalSensorsTargetTestUtils so that the VTS binaries that depend on it
don't need to all pull them in themselves.

Fixes: 158018963
Test: VtsHalSensorsV2_0TargetTest on a device supporting the v4.0 HALs
Change-Id: Idc47ffb8cacd1ac84d45b979cd45fe630b6808f6
2020-06-04 16:33:09 -07:00
Dan Shi
f2956479e3 Merge "Use StopServicesSetup to stop/start framework." into rvc-dev am: e8f9e0959f
Change-Id: I9b0e7c3c76a33526bd90730b1f775e29134d909e
2020-05-13 23:12:44 +00:00
Dan Shi
e8f9e0959f Merge "Use StopServicesSetup to stop/start framework." into rvc-dev 2020-05-13 22:52:20 +00:00
TreeHugger Robot
2e59c22326 Merge "Use StopServicesSetup to stop/start framework." into rvc-dev 2020-05-13 21:44:19 +00:00
Dan Shi
2d11037a0b Use StopServicesSetup to stop/start framework.
Bug: 155774142
Test: none
Change-Id: I3dfec18df478b0a4ae16c454d110e5c05f33cbca
2020-05-13 14:03:24 -07:00
Dan Shi
1a380f7b5b Use StopServicesSetup to stop/start framework.
Bug: 155774142
Test: none
Exempt-From-Owner-Approval: This CL replaces target preparer, shouldn't
change test behavior.

Change-Id: I83cffadfff15e6352a69641c3227efb63e7a34e4
Merged-In: I83cffadfff15e6352a69641c3227efb63e7a34e4
2020-05-13 14:02:04 -07:00
Dan Shi
3b6534e36d Use StopServicesSetup to stop/start framework. am: 8a648312f8 am: 95d430d6c8
Change-Id: I96a02ab530d4efd386c5f835bbb932e62ea8ea7d
2020-05-13 18:19:37 +00:00
Dan Shi
95d430d6c8 Use StopServicesSetup to stop/start framework. am: 8a648312f8
Change-Id: I0a3f67e848b2452b1919ae0e26d69fc1a9a9ce15
2020-05-13 18:05:52 +00:00
Dan Shi
8a648312f8 Use StopServicesSetup to stop/start framework.
Bug: 155774142
Test: none
Exempt-From-Owner-Approval: This CL replaces target preparer, shouldn't
change test behavior.

Change-Id: I83cffadfff15e6352a69641c3227efb63e7a34e4
2020-05-12 14:07:30 -07:00
Treehugger Robot
552990ed42 Merge "Rename vts-core to vts" 2020-05-08 01:44:18 +00:00
Dan Shi
fcced28d93 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.

Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
Change-Id: If871035f66631869d1082a557e2639a2766cd1de
2020-05-07 16:25:29 -07:00
Ahmad Rahmati
388e2efecc Merge "Add SCOPED_TRACE to VTS tests that loop over all sensors" into rvc-dev am: 91c5deafc3
Change-Id: I41aeba2fa41e10dad5ad05b6b87b89ea048bf58f
2020-05-07 22:16:17 +00:00
Treehugger Robot
1f65d20a39 Merge "sensors:2.0:vts fix functional test for typeAsString field" am: e3fc570d6d
Change-Id: Iec84bed4fe462001a577b382e4934b59b765017b
2020-05-07 16:50:25 +00:00
Treehugger Robot
e3fc570d6d Merge "sensors:2.0:vts fix functional test for typeAsString field" 2020-05-07 16:34:31 +00:00
Ahmad Rahmati
8276a3bb02 Add SCOPED_TRACE to VTS tests that loop over all sensors
SCOPED_TRACE enables the error message contains enough detail to
easily narrow down the root cause

Bug: 154357354
Test: atest VtsHalSensorsV2_0Target VtsHalSensorsV2_1Target
Change-Id: Id6dbbe8bd8617776efec383d5276e9e12006f27d
2020-05-07 02:45:30 +00:00
Stan Rokita
f26ba8c59f Search for subhal .so files in additional directories am: b42bde95cb
Change-Id: I1fb0ce977406e07a26278a2be0e2380ee7d677f4
2020-05-06 23:00:18 +00:00
Stan Rokita
b42bde95cb 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
Merged-In: I8a676b97f6f6992e8937ecf31c3b7af06e676ebb
2020-05-06 15:02:42 -07:00
Denis Ciocca
8ab752617f sensors:2.0:vts fix functional test for typeAsString field
For sensors of known type defined in SensorType (value <
DEVICE_PRIVATE_BASE), typeAsString field can be an empty string since
framework overrides it anyways.
The empty string test should fails only if type is >=
DEVICE_PRIVATE_BASE.
The matching type with typeAsString test is instead executed only if
the string is not empty (if it's not an empty string let's check that
at least is set to the right value).

Bug: 155514483
Test: atest VtsHalSensorsV2_0TargetTest
Signed-off-by: Denis Ciocca <denis.ciocca@gmail.com>
Merged-In: Ib5f8fd513313670e88c2b973c1ff724658914eb2
Change-Id: I4267ff6a158a571ff43122bdb7a38c9fa38f5900
2020-05-05 16:10:46 +00:00
TreeHugger Robot
f4ebf94103 Merge "Fix Sensors VTS asserts for sensor type strings" into rvc-dev am: abc7986d1a
Change-Id: Iaf3b7fd1de42a5e5665a5bd74bb9f49d7d13c2ec
2020-05-05 15:24:41 +00:00
Anthony Stange
908e4479dd Fix Sensors VTS asserts for sensor type strings
Private sensors are the only sensor types that must define a type
string. For public sensors, a type string can be left empty as it will
be overridden by the sensors frameork.

Bug: 155514483
Test: atest VtsHalSensorsV2_0Target
Change-Id: Ib5f8fd513313670e88c2b973c1ff724658914eb2
2020-05-04 14:54:19 -04:00
TreeHugger Robot
da0ae1cfe4 Merge "Search for subhal .so files in additional directories" into rvc-dev am: 358db3b106
Change-Id: Id04399150e05bcc198ed8f9ccee9448e4a4a1581
2020-05-02 02:48:41 +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
6c3ed907d7 V2: Update tests for multihal to test HAL 2.1 am: 7a21c53268
Change-Id: Ic4addb6b376c34390f8afb2b954a2fb163c25d99
2020-04-30 21:51:24 +00:00
Anthony Stange
91b3dced0f V2: Create Multi-HAL 2.1 service am: 199b5ff96a
Change-Id: Ibfd005e49e0754daf757f4db1b6154760a55b04d
2020-04-30 21:51:20 +00:00
Anthony Stange
56f6c459df V2: Set up Multi-HAL for Sensors HAL 2.1 am: 33acf9fb3a
Change-Id: I5de7348d33466bcfb8da450c57472327aafd7772
2020-04-30 21:51:18 +00:00
Anthony Stange
7a21c53268 V2: Update tests for multihal to test HAL 2.1
Updates tests and fake subhals to support Multi-HAL 2.1 to make
on-device testing feasible.

Bug: 149758467
Test: Verify that the new unit tests and subhals in this topic load and
run on a Pixel device

Change-Id: I7a9d7c1678826bb1956119e8b76f591c7bc213e1
2020-04-30 08:45:19 -04:00
Anthony Stange
199b5ff96a V2: Create Multi-HAL 2.1 service
Bug: 149758467
Test: Verify that the new unit tests and subhals in this topic load and
run on a Pixel device

Change-Id: I275274659816b3a00374fb0b7a93f199874afdcd
2020-04-30 08:45:19 -04: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
68bf7e87b3 Merge changes from topic "revert-10501254-multihal_2_1-FNHFKNQMKB" into rvc-dev am: 7a63ec7734
Change-Id: Ic95046c31867bcda12ab27c0870907fb0109afab
2020-04-29 23:00:34 +00:00
Nick Chalko
7a63ec7734 Merge changes from topic "revert-10501254-multihal_2_1-FNHFKNQMKB" into rvc-dev
* changes:
  Revert "Set up Multi-HAL for Sensors HAL 2.1"
  Revert "Create Multi-HAL 2.1 service"
  Revert "Update tests for multihal to test HAL 2.1"
2020-04-29 22:46:09 +00: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
Nick Chalko
6691d85d0b Revert "Create Multi-HAL 2.1 service"
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: I5e828d1dfd4f9ede5cbd38ff8bc4cc5dc48e4d76
2020-04-29 22:20:59 +00:00
Nick Chalko
f4b5b40b4a Revert "Update tests for multihal to test 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: I8b97eb29633cf24f464d742770256791108c27dd
2020-04-29 22:13:29 +00:00
TreeHugger Robot
e5f735df7d Merge changes from topic "multihal_2_1" into rvc-dev am: 89b216690c
Change-Id: I3d5bc424d10777f37fb66b6023f4d822afcfea7a
2020-04-29 21:03:43 +00:00
TreeHugger Robot
32d96a1852 Merge "Remove non-test ScopedWakelock dependency" into rvc-dev am: 24087f1219
Change-Id: I9f5da262411ec143ba3da9da0e5734d96dfa53b9
2020-04-29 21:02:58 +00:00
TreeHugger Robot
89b216690c Merge changes from topic "multihal_2_1" into rvc-dev
* changes:
  Update tests for multihal to test HAL 2.1
  Create Multi-HAL 2.1 service
  Set up Multi-HAL for Sensors HAL 2.1
2020-04-29 20:56:30 +00:00
Anthony Stange
67888489ce Update tests for multihal to test HAL 2.1
Updates tests and fake subhals to support Multi-HAL 2.1 to make
on-device testing feasible.

Bug: 149758467
Test: Verify that the new unit tests and subhals in this topic load and
run on a Pixel device

Change-Id: I2be51568ba8dd99aa0588b8945d3d41bda7d9941
2020-04-29 11:25:26 -04:00
Stan Rokita
99a9a529ba Remove non-test ScopedWakelock dependency
Unit tests were depending on a non test library unecesarrily and it was
causing unit test build failure.

Fixes: 155239061
Test: atest android.hardware.sensors@2.0-halproxy-unit-tests
Change-Id: I057a432fdbef93680a67558c27ed7adc7fedfbbc
2020-04-28 18:31:46 -07:00
Anthony Stange
82f8d46691 Create Multi-HAL 2.1 service
Bug: 149758467
Test: Verify that the new unit tests and subhals in this topic load and
run on a Pixel device

Change-Id: Id5ab7b606f91764a456d8e3a16f7f0f2cf9b4fef
2020-04-28 17:49:02 -04: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
Denis Ciocca
d3c27ec3f7 Include VtsHalSensorsV2_0TargetTest into the vts test suites
Without adding the test into vts test suite the testcases are not
available within the vts-tradefed.

Test: manual - build vts using 'make vts' with arm64 target selected,
               verifying that the test is then available under:
               out/host/linux-x86/vts/android-vts/testcases/VtsHalSensorsV2_0TargetTest

Signed-off-by: Denis Ciocca <denis.ciocca@gmail.com>
Change-Id: I34a89bef09832e5fa8295340f52dafd91fa33c96
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-04-23 10:24:43 -07:00