Commit graph

34996 commits

Author SHA1 Message Date
Yifan Hong
b1030dcd79 health: separate_platform_variant = false am: b47f676008 am: 4eb35d82b2 am: 5aa275fce8 am: e53f88d29d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870443

Change-Id: Ie92f8c9417535b927535b67df07f601c2feab3bf
2021-10-26 23:36:46 +00:00
Yifan Hong
df4af12d1a health: Convert of health HAL to AIDL am: 52ecb3f421 am: cf3b460b9b am: 359428aade am: 345c56bcad
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1550321

Change-Id: Ia4571ac2705dfc6837079708ccc8668f2e1fa819
2021-10-26 23:36:44 +00:00
Yifan Hong
e53f88d29d health: separate_platform_variant = false am: b47f676008 am: 4eb35d82b2 am: 5aa275fce8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870443

Change-Id: I60af6e925cb6dc314e6c08abf216383f9c0bcc92
2021-10-26 23:16:43 +00:00
Yifan Hong
345c56bcad health: Convert of health HAL to AIDL am: 52ecb3f421 am: cf3b460b9b am: 359428aade
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1550321

Change-Id: Ib04dfb3f3927101bceddc31e89f1bb646187caa1
2021-10-26 23:16:41 +00:00
Yifan Hong
5aa275fce8 health: separate_platform_variant = false am: b47f676008 am: 4eb35d82b2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870443

Change-Id: Icc249b15f1178d917eab8dad50818879a106bfca
2021-10-26 23:15:21 +00:00
Yifan Hong
359428aade health: Convert of health HAL to AIDL am: 52ecb3f421 am: cf3b460b9b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1550321

Change-Id: I298097d0dcfceace816673c5b81544769efed9a8
2021-10-26 23:15:19 +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
Felipe Leme
aa66d6a12b Merge "Parse user flags as flags instead of enum." am: 8bfd990678 am: 53f9948c62 am: 64edea9ebe am: c3eac7a9a8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869945

Change-Id: Id6a03ccdab336c82fac26f8c680e6aeb1487ea27
2021-10-26 21:04:07 +00:00
Felipe Leme
c3eac7a9a8 Merge "Parse user flags as flags instead of enum." am: 8bfd990678 am: 53f9948c62 am: 64edea9ebe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869945

Change-Id: I1c98228ad731705d35e03847353fb65234ff9296
2021-10-26 20:49:56 +00:00
Felipe Leme
64edea9ebe Merge "Parse user flags as flags instead of enum." am: 8bfd990678 am: 53f9948c62
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869945

Change-Id: Ibeb7aef7aacb5584435842a719e6096ea013f6cd
2021-10-26 20:31:31 +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
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
638f98a2f2 libkeymint_support: Make it vendor accessiable am: abcf89dd53 am: 948bfe2cae am: 1f8a0ea462 am: 582686b67f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870241

Change-Id: I9ccd5da47092fadd88cd6876c3ee2bf0359aa3d3
2021-10-26 17:39:06 +00:00
Tommy Chiu
582686b67f libkeymint_support: Make it vendor accessiable am: abcf89dd53 am: 948bfe2cae am: 1f8a0ea462
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870241

Change-Id: Ifdb34e8f4dfba4bcbaccf78d03bd1b4606b70cf5
2021-10-26 17:24:47 +00:00
Yomna Nasser
83f112313e [automerger skipped] Merge "VTS fix for getAllowedNetworkTypesBitmap and setAllowedNetworkTypesBitmap" into sc-v2-dev am: cc96134697 -s ours
am skip reason: Merged-In I0b50e7e6c0d406a62f7a1e2ea8ac9bc3a71d8aeb with SHA-1 20aa01c238 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16091381

Change-Id: Iec201f0a357a6873a97fda399cab10e198f31caf
2021-10-26 17:24:42 +00:00
Tommy Chiu
1f8a0ea462 libkeymint_support: Make it vendor accessiable am: abcf89dd53 am: 948bfe2cae
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870241

Change-Id: Iab163f5c757b1deabb3e8b78aacfc61a448dae47
2021-10-26 17:08:41 +00:00
Yomna Nasser
cc96134697 Merge "VTS fix for getAllowedNetworkTypesBitmap and setAllowedNetworkTypesBitmap" into sc-v2-dev 2021-10-26 17:07:42 +00: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
370231cf2a Revert "Provide explicitly versioned NNAPI AIDL utils libs -- HAL." am: c42a934ea8 am: 542eaadcc2 am: c1701d8849 am: 2483116704
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870083

Change-Id: I1f2fe600cd0276517e02eed38ee5731734771840
2021-10-26 05:31:53 +00:00
Michael Butler
2483116704 Revert "Provide explicitly versioned NNAPI AIDL utils libs -- HAL." am: c42a934ea8 am: 542eaadcc2 am: c1701d8849
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870083

Change-Id: I5ca60945d9caecb5b2d239a9762d698ec38c8a2b
2021-10-26 05:22:49 +00:00
Michael Butler
c1701d8849 Revert "Provide explicitly versioned NNAPI AIDL utils libs -- HAL." am: c42a934ea8 am: 542eaadcc2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870083

Change-Id: Idda3eb71c22e7c13b546267779f2ae3f608f9576
2021-10-26 05:11:44 +00: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
c799037278 Provide explicitly versioned NNAPI AIDL utils libs -- HAL. am: cb2c37f78f am: 142fc99967 am: 94f01b3d5e am: 69451a3212
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869667

Change-Id: I0b2c22045dac019e576d29d6704f704b29e3f420
2021-10-26 00:30:36 +00:00
Xusong Wang
69451a3212 Provide explicitly versioned NNAPI AIDL utils libs -- HAL. am: cb2c37f78f am: 142fc99967 am: 94f01b3d5e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869667

Change-Id: I60583bda18ecf5d2406abbc294b2ef72b5aa0459
2021-10-26 00:15:43 +00:00
Xusong Wang
94f01b3d5e Provide explicitly versioned NNAPI AIDL utils libs -- HAL. am: cb2c37f78f am: 142fc99967
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869667

Change-Id: I860af758dfd386fe9b6baa57af0167f3adb57c6e
2021-10-26 00:01:11 +00: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
TreeHugger Robot
ebb0fb0ccb Merge "Parse user flags as flags instead of enum." into sc-v2-dev am: f8183c2914
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16095300

Change-Id: I3cd4fb0735dfbce84cf2df293c612988c15d3c8d
2021-10-25 20:47:31 +00:00
TreeHugger Robot
f8183c2914 Merge "Parse user flags as flags instead of enum." into sc-v2-dev 2021-10-25 20:33:59 +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
Yu Shan
5c0ec3f1de 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
2021-10-25 12:36:27 -07:00
TreeHugger Robot
6a5253c763 Merge "Update VtsHalEvsV1_1TargetTest" into sc-v2-dev am: 7630dd9f4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15973919

Change-Id: If8328ed7aa95612f37658402508132f8841c3a5e
2021-10-24 15:24:25 +00:00
TreeHugger Robot
7630dd9f4f Merge "Update VtsHalEvsV1_1TargetTest" into sc-v2-dev 2021-10-24 15:11:09 +00:00
Marin Shalamanov
89ccd6cc12 [automerger skipped] Revert "VTS: Test that configs in a group differ only by vsync period" am: 3ccc2de9c4 -s ours
am skip reason: Merged-In Id0bfc67e55d5139fddb2b359cabafd9281c33734 with SHA-1 bf484a6adb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16094379

Change-Id: I40b5df2f92a4735bb2aa25d62da61fac184a3200
2021-10-21 23:48:38 +00:00
Yomna Nasser
849d924d6d VTS fix for getAllowedNetworkTypesBitmap and setAllowedNetworkTypesBitmap
Fix VTS for getAllowedNetworkTypesBitmap and
setAllowedNetworkTypesBitmap, which should not rely on
getRadioHalCapabilities.

Bug: b/199809900
Test: atest VtsHalRadioV1_6TargetTest
Change-Id: I0b50e7e6c0d406a62f7a1e2ea8ac9bc3a71d8aeb
Merged-In: I0b50e7e6c0d406a62f7a1e2ea8ac9bc3a71d8aeb
2021-10-21 15:05:11 +00:00
Treehugger Robot
965ac84f69 Merge "Backfill owner information for VtsHalPower." am: 32250df35e am: 77a5bbb77b am: e4648b50ed am: 83ebba1da1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1813768

Change-Id: I1ad88920eb3d5f5a53f55c46614a1701bd788e5c
2021-10-21 03:02:11 +00:00
Treehugger Robot
83ebba1da1 Merge "Backfill owner information for VtsHalPower." am: 32250df35e am: 77a5bbb77b am: e4648b50ed
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1813768

Change-Id: I889b27abaa099e95a8c6c512d1469dce89b37c9a
2021-10-21 02:38:40 +00:00
Treehugger Robot
e4648b50ed Merge "Backfill owner information for VtsHalPower." am: 32250df35e am: 77a5bbb77b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1813768

Change-Id: I336d5de1d2b8106cd7794a3601dbe561f3118538
2021-10-21 02:23:34 +00: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
9d68d6be49 Merge "Update OWNERS for VtsHalGraphicsComposer tests." am: cb0667c916 am: 83f6228bdf am: 2b799702ab am: d2eeeaabc2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861820

Change-Id: I20bb8bc2983b40d7c5565a61086be497d7bcf636
2021-10-20 20:43:51 +00:00
Treehugger Robot
d2eeeaabc2 Merge "Update OWNERS for VtsHalGraphicsComposer tests." am: cb0667c916 am: 83f6228bdf am: 2b799702ab
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861820

Change-Id: I6fcc7fa041a3880c025339e4a9136c8e599da172
2021-10-20 20:29:37 +00:00
Treehugger Robot
2b799702ab Merge "Update OWNERS for VtsHalGraphicsComposer tests." am: cb0667c916 am: 83f6228bdf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861820

Change-Id: I72f5f6d5f5b26f83f8a13a557f2b0dfd893b83e2
2021-10-20 20:07:31 +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