Commit graph

33637 commits

Author SHA1 Message Date
Ian Hua
65a058482b Add FL6 spec tests to AIDL VTS. am: ca46f9768c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1866682

Change-Id: Id4fe712adc08793e48263183d0ab958517048681
2021-10-27 16:00:58 +00:00
Ian Hua
ca46f9768c Add FL6 spec tests to AIDL VTS.
Also skip FL6 (AIDL_V2) tests for older AIDL drivers.

Bug: 203038813
Test: VtsHalNeuralnetworksTargetTest
Specifically, for old driver such as AIDL_V1 sample driver, it can pass
HIDL tests and skip AIDL_V2 tests. For new driver such as AIDL_V2
sample driver, it can pass all tests.

Change-Id: I689fef0945428f6548977628e3c43628dd1e5bf7
2021-10-27 11:55:25 +01:00
Michael Butler
b9aff55ad9 Merge changes Iae9f692f,Ib43f1cb6,I9d4f0c30,I7d06ea35 am: 5f14bad22c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1863342

Change-Id: Ie2dadd254c67ca24e7350b5e6d7e501c8bc6d703
2021-10-27 00:20:55 +00:00
Michael Butler
5f14bad22c Merge changes Iae9f692f,Ib43f1cb6,I9d4f0c30,I7d06ea35
* changes:
  Move NN HandleError from utils/common to 1.0/utils
  Relocate NN ProtectCallback to 1.0/utils
  Move NN memory utils from utils/common to 1.0/utils
  Remove hal::utils::countNumberOfConsumers
2021-10-26 23:55:24 +00:00
Steven Moreland
f802438361 Merge changes from topic "health-aidl" am: 713d22e0f1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861824

Change-Id: I66a5983036a8679c5469a4295126aeee238ad303
2021-10-26 22:55:48 +00:00
Yifan Hong
4eb35d82b2 health: separate_platform_variant = false am: b47f676008
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870443

Change-Id: I113e771f52bfd0b4bbd0b9a1f64d80e03afce01f
2021-10-26 22:55:47 +00:00
Yifan Hong
cf3b460b9b health: Convert of health HAL to AIDL am: 52ecb3f421
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1550321

Change-Id: I5083a0066a63101817886a548aabc0dcbb319722
2021-10-26 22:55:45 +00:00
Steven Moreland
713d22e0f1 Merge changes from topic "health-aidl"
* changes:
  health: Add to compatibility matrix.
  health: separate_platform_variant = false
  health: Convert of health HAL to AIDL
2021-10-26 22:33:31 +00:00
Michael Butler
49d95e0457 Move NN HandleError from utils/common to 1.0/utils
This change is part of a larger chain of changes to remove HIDL and AIDL
libraries from neuralnetworks_utils_hal_common.

Bug: N/A
Test: mma
Change-Id: Iae9f692ffc72700294aae694c256e75c7e353fef
2021-10-26 21:18:33 +00:00
Michael Butler
e8645c3b8d Relocate NN ProtectCallback to 1.0/utils
This change is part of a larger chain of changes to remove HIDL and AIDL
libraries from neuralnetworks_utils_hal_common.

Bug: N/A
Test: mma
Change-Id: Ib43f1cb683a09ae5c9116a6dea4d269c9c2c78b4
2021-10-26 21:18:09 +00:00
Michael Butler
15965821e8 Move NN memory utils from utils/common to 1.0/utils
This change is part of a larger chain of changes to remove HIDL and AIDL
libraries from neuralnetworks_utils_hal_common.

Bug: N/A
Test: mma
Change-Id: I9d4f0c30932fad7ccb6231aa03e57f7227af4880
2021-10-26 21:17:53 +00:00
Michael Butler
301ef060e9 Remove hal::utils::countNumberOfConsumers
This CL removes hal::utils::countNumberOfConsumers and uses the existing
nn::countNumberOfConsumers.

This change is part of a larger chain of changes to remove HIDL and AIDL
libraries from neuralnetworks_utils_hal_common.

Bug: N/A
Test: mma
Change-Id: I7d06ea355eae7aa80b94b09a23d606bbb2322120
2021-10-26 21:17:10 +00:00
Felipe Leme
53f9948c62 Merge "Parse user flags as flags instead of enum." am: 8bfd990678
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869945

Change-Id: I6a14d852008dd847c289c8430e4d6c3932f0bc03
2021-10-26 20:11:37 +00:00
Felipe Leme
8bfd990678 Merge "Parse user flags as flags instead of enum." 2021-10-26 19:40:00 +00:00
Yu Shan
68cb8c04e8 Parse user flags as flags instead of enum.
The flags field in UserInfo is a int32_t that contains multiple
UserFlags 'or'ed together. We should not parse it as enum.

Test: atest android.hardware.automotive.vehicle@2.0-utils-unit-tests
Bug: 202520478
Change-Id: Ie7e81a8a5f39f6070e35f2e77bce88a211fd526b
Merged-In: Ie7e81a8a5f39f6070e35f2e77bce88a211fd526b
(cherry picked from commit 5c0ec3f1de)
2021-10-26 19:39:48 +00:00
Yifan Hong
21a22cece4 health: Add to compatibility matrix.
For now, add as optional. Once we finished implementing
it on Android T devices, make it required.

Test: pass
Bug: 177269435
Change-Id: I148b7567d8e154cb5e16ec01b547785f90c7a706
2021-10-26 11:03:04 -07:00
Yifan Hong
b47f676008 health: separate_platform_variant = false
Disable the generation of ndk_platform variant during the
ndk_platform -> ndk migration.

Test: builds
Bug: 177269435
Change-Id: I467eaee53542b152df1d398a8f044eb42fd01772
2021-10-26 11:03:03 -07:00
Yifan Hong
52ecb3f421 health: Convert of health HAL to AIDL
On top of the hidl2aidl translation, the following is
done manually:

- Renamed the package from health2 to health. Also pulls in
health@1.0::Battery* enums.
- Removes Result and Constants enum. Result values are returned
as transaction status codes.
- Removes health@2.1 charger related APIs.
  - remove shouldKeepScreenOn
  - remove getHealthConfig
  - remove HealthConfig type
- Removes StorageAttribute because it is not used in the framework
- Add units to HealthInfo fields and IHealth methods.
- Update docs (namely, u -> µ in various places)

Bug: 177269435
Test: pass

Change-Id: I9c9a9d9dd5d49142258e608a463412d3e89e91a3
2021-10-26 11:03:03 -07:00
Tommy Chiu
948bfe2cae libkeymint_support: Make it vendor accessiable am: abcf89dd53
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870241

Change-Id: I5ccd30e1e286a50559c2ba5055f03a895923454b
2021-10-26 16:53:10 +00:00
Tommy Chiu
abcf89dd53 libkeymint_support: Make it vendor accessiable
This support function is supposed to be useable by vendor in treble.
Add "vendor_available" to reflect that.

Bug: 203481954
Test: Link by vendor successfully
Change-Id: I9709ac0ab79405c336ed8a1bc44b2ef643dd5b2d
2021-10-26 23:25:42 +08:00
Michael Butler
542eaadcc2 Revert "Provide explicitly versioned NNAPI AIDL utils libs -- HAL." am: c42a934ea8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870083

Change-Id: I0e3e226d9450811200c5d5a69a01de79e07de1c3
2021-10-26 04:58:28 +00:00
Michael Butler
c42a934ea8 Revert "Provide explicitly versioned NNAPI AIDL utils libs -- HAL."
Revert "Use explicitly versioned NNAPI HAL util libs in darwinn2."

Revert "Add neuralnetworks_utils_hal_aidl_v2 to allowed_deps.txt"

Revert "Provide explicitly version NNAPI AIDL utils lib -- runtime."

Revert submission 16007539-nnapi-experimental-aidl-feature

Reason for revert: The cherry-pick of this CL breaks the build
Reverted Changes:
Ieb2da3461:Add neuralnetworks_utils_hal_aidl_v2 to allowed_de...
I8ae01e3c6:Provide explicitly version NNAPI AIDL utils lib --...
I74f1798e8:Provide explicitly versioned NNAPI AIDL utils libs...
I2362464e8:Use explicitly versioned NNAPI HAL util libs in da...

Test: mma

Change-Id: I3d3ac4745fb707cbdceb2019f3c2fc7807183b71
Merged-In: I3d3ac4745fb707cbdceb2019f3c2fc7807183b71
(cherry picked from commit 932e82b0c3)
2021-10-25 21:13:15 -07:00
Xusong Wang
142fc99967 Provide explicitly versioned NNAPI AIDL utils libs -- HAL. am: cb2c37f78f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869667

Change-Id: I6982ec9725bcd7baa42f7e42327b46b73c8c8bfb
2021-10-25 23:44:48 +00:00
Xusong Wang
cb2c37f78f Provide explicitly versioned NNAPI AIDL utils libs -- HAL.
This CL modifies the AIDL utils libraries to be explicitly
versioned. Currently, we only have two versions: v1 and "current".
Specifically, the following changes are made:
- Remove AIDL dependencies from neuralnetworks_utils_hal_common
- Create explicitly versioned libs of neuralnetworks_utils_hal_aidl_*

This is needed because it is not allowed for a build target to
link against multiple versions of the same AIDL lirary.

The canonical driver will report ANDROID_S for AIDL v1, and FL6 for v2.

Bug: 202405342
Test: NNT_static
Test: CtsNNAPITestCases
Test: VtsHalNeuralnetworksTargetTest
Change-Id: I74f1798e80a059949e43e0567d23e884a7f7c92d
Merged-In: I74f1798e80a059949e43e0567d23e884a7f7c92d
(cherry picked from commit 9763a9537d)
2021-10-25 12:58:44 -07:00
Treehugger Robot
77a5bbb77b Merge "Backfill owner information for VtsHalPower." am: 32250df35e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1813768

Change-Id: Id24e4532ee4b47ceaee80a70cb29766f7ef9e73b
2021-10-21 02:13:54 +00:00
Treehugger Robot
32250df35e Merge "Backfill owner information for VtsHalPower." 2021-10-21 01:59:02 +00:00
Treehugger Robot
83f6228bdf Merge "Update OWNERS for VtsHalGraphicsComposer tests." am: cb0667c916
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861820

Change-Id: I998135e9aa29a398204d4ee6f2bd9da9ac2820b5
2021-10-20 19:46:14 +00:00
Treehugger Robot
cb0667c916 Merge "Update OWNERS for VtsHalGraphicsComposer tests." 2021-10-20 19:28:03 +00:00
David Gross
9fc0aae600 Merge "Add PACK operation to NNAPI feature level 6." am: 6e74ca65a7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1835817

Change-Id: If138128482f02242138cff3bdb847a13e8e22395
2021-10-19 21:25:06 +00:00
Treehugger Robot
6168dbf926 Merge "health: AIDL add owners." am: 68b3942abe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1863334

Change-Id: I83f22f672f82c20e07c9828913286eff76e1641d
2021-10-19 21:24:55 +00:00
David Gross
6e74ca65a7 Merge "Add PACK operation to NNAPI feature level 6." 2021-10-19 21:23:12 +00:00
Treehugger Robot
68b3942abe Merge "health: AIDL add owners." 2021-10-19 21:13:20 +00:00
Treehugger Robot
80d053dcb1 Merge "health: drop backup instance for non-recovery." am: c900d6f20e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861817

Change-Id: I40fc18ab097d711c40e19c8517e620b2d19b3fff
2021-10-19 20:43:31 +00:00
Treehugger Robot
c900d6f20e Merge "health: drop backup instance for non-recovery." 2021-10-19 20:23:56 +00:00
Yifan Hong
9ca39cef7f health: AIDL add owners.
... for usage in other places.

Test: none
Bug: 177269435
Change-Id: I74ea2a497237d966db0c146868c61a1a667e8cca
2021-10-19 19:51:58 +00:00
Yifan Hong
a76a2bf65b health: drop backup instance for non-recovery.
For the core variant (system), clients like storaged
etc. should no longer access the "backup" instance, because
healthd is removed from the system image.

For the vendor variant, this would only break if a
vendor image were launched with Android O / O-MR1 (so
health@2.0 is not required), and were compiled against an
Android T (and above) source tree (which won't check
the "backup" instance). This shouldn't be a valid configuration.

For the recovery variant, the "backup" instance has a different
meaning. It points to

  android.hardware.health@2.0-impl-default.recovery

... which was assumed by OEMs to be always installed when a
vendor-specific libhealthd is not necessary. Hence, its behavior
is kept. See

  hardware/interfaces/health/2.0/README.md

android.hardware.health@2.0-impl-default.recovery, and subsequently the
special handling of recovery mode below, can be removed once health@2.1
is the minimum required version (i.e. compatibility matrix level 3 is
removed). Health 2.1 requires OEMs to install the implementation
to the recovery partition when it is necessary (i.e. on non-A/B devices,
where IsBatteryOk() is needed in recovery).

Test: pass
Bug: 203245871

Change-Id: Ife14f5bdaba20e4cf5bd0b954aea4d04a62009c4
2021-10-19 12:50:11 -07:00
David Gross
79d63db0c8 Add PACK operation to NNAPI feature level 6.
Bug: 200281183
Bug: 200280665

Test: m -j NeuralNetworksTest_static
Test: VtsHalNeuralnetworksTargetTest

Change-Id: Ic15d047b70c62437b4f0db6f2ca10127591ae07c
2021-10-19 11:04:57 -07:00
Treehugger Robot
3a160584e0 Merge "Update OWNERS for VtsHalContexthub tests." am: 46753c42c2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861819

Change-Id: Ia873f977490b25acb159444274d3fe0f21fc87ad
2021-10-19 13:12:58 +00:00
Treehugger Robot
46753c42c2 Merge "Update OWNERS for VtsHalContexthub tests." 2021-10-19 12:52:53 +00:00
Treehugger Robot
40234ee63b Merge "Backfill owner information for VTS module VtsHalOemLockV1_0TargetTest." am: 80161cfc16
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1813766

Change-Id: I6a0d224ac075c7e70e0aa5796971d8d17372aea9
2021-10-19 02:36:48 +00:00
Treehugger Robot
80161cfc16 Merge "Backfill owner information for VTS module VtsHalOemLockV1_0TargetTest." 2021-10-19 02:16:30 +00:00
Treehugger Robot
ec003365b1 Merge "Update OWNERS for VtsHalWifiSupplicant tests." am: b27df86140
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793006

Change-Id: I2e4a88da6cf42c0b79a83031253e2f6c18171b78
2021-10-19 01:11:54 +00:00
Treehugger Robot
b27df86140 Merge "Update OWNERS for VtsHalWifiSupplicant tests." 2021-10-19 00:55:03 +00:00
Yiming Pan
cd9afdf0af Update OWNERS for VtsHalGraphicsComposer tests.
Test: Tree Hugger
Bug: 143903671
Change-Id: I228402a350ecccac92dea7c5facde60496ba3e6e
2021-10-18 17:28:00 -07:00
Yiming Pan
97f2192a92 Update OWNERS for VtsHalContexthub tests.
Added a bug component where issues seen on this test are triaged.

Test: Tree Hugger
Bug: 143903671
Change-Id: Id0dd876c00206c372e7fa608fdd731be3d4d72bb
2021-10-18 17:18:04 -07:00
Michael Butler
d236dbf3b3 Merge "Allow implicit conversions for NN errors -- hal" am: 68e98f40dc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1859936

Change-Id: I923b800bacb7c968b7d2be67c943aab402b2248e
2021-10-18 23:05:32 +00:00
Michael Butler
68e98f40dc Merge "Allow implicit conversions for NN errors -- hal" 2021-10-18 22:45:51 +00:00
Treehugger Robot
3741e92674 Merge "Revert "VTS: Test that configs in a group differ only by vsync period"" am: b350c7cf49
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1830034

Change-Id: I04075d9e644eebc0b1e7235344a2090c80cb2556
2021-10-18 21:53:16 +00:00
Treehugger Robot
b350c7cf49 Merge "Revert "VTS: Test that configs in a group differ only by vsync period"" 2021-10-18 21:39:37 +00:00
Treehugger Robot
47c7b2f334 Merge "Revert "Clarify the ComposerClient comment for CONFIG_GROUP"" am: 184c1b546c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1830033

Change-Id: Ie647ea4237f10ad0460643c7dea97a54cab47ee7
2021-10-18 21:14:31 +00:00