Commit graph

33911 commits

Author SHA1 Message Date
David Drysdale
b7633b628a Merge "Specify KeyMint EC keys by curve not size" am: 153bbc9cc5 am: 0e3027ab80
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1857515

Change-Id: If9c33f5574bfd7b02a035c83eac6359b9339a9c2
2021-10-29 06:24:55 +00:00
David Drysdale
0e3027ab80 Merge "Specify KeyMint EC keys by curve not size" am: 153bbc9cc5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1857515

Change-Id: If9f70170cf065013e39a1439ff1f5b85715f4dac
2021-10-29 06:12:38 +00:00
David Drysdale
153bbc9cc5 Merge "Specify KeyMint EC keys by curve not size" 2021-10-29 05:54:57 +00:00
Yifan Hong
5b3a4eb7a2 Merge "health: Add default impl of health AIDL HAL" am: 236fa8908c am: 8fe0dacf4f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1550322

Change-Id: I9dd9de1ad1e913fc09cddc498371ddf85e70101a
2021-10-28 03:31:48 +00:00
Yifan Hong
8fe0dacf4f Merge "health: Add default impl of health AIDL HAL" am: 236fa8908c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1550322

Change-Id: I882566f05cb4b8ca32c7c19595e51008330b5ec2
2021-10-28 03:17:28 +00:00
Yifan Hong
236fa8908c Merge "health: Add default impl of health AIDL HAL" 2021-10-28 02:57:56 +00:00
Jayachandran Chinnakkannu
0bdb66adb3 Merge "Do not assert CardState::PRESENT on sim power down" am: b311ffdb2a am: 43d81bfc35
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869544

Change-Id: I086e83a5e756a228382e7020199ab9bda4a848c2
2021-10-28 01:38:28 +00:00
Jayachandran Chinnakkannu
43d81bfc35 Merge "Do not assert CardState::PRESENT on sim power down" am: b311ffdb2a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869544

Change-Id: I66a4c7ce6d1a496ab897f66f98a748a5cf920e2b
2021-10-28 01:19:09 +00:00
Jayachandran Chinnakkannu
b311ffdb2a Merge "Do not assert CardState::PRESENT on sim power down" 2021-10-28 00:56:00 +00:00
Jordan Liu
13d864a421 Do not assert CardState::PRESENT on sim power down
Bug: 203031664
Test: manual
Change-Id: I6c9cbad7cd4fd19eb0b77c55ff37298b97f32050
Merged-In: I6c9cbad7cd4fd19eb0b77c55ff37298b97f32050
2021-10-28 00:55:51 +00:00
Treehugger Robot
bdc8c88352 Merge "Bluetooth HAL: Add missing retry logic to the H4Protocol::Send()" am: 9fec2f0104 am: fab5684ffe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1859827

Change-Id: Ib74878bcdbaf3a6685c8c45b90429ffea9f37ccd
2021-10-27 20:35:59 +00:00
Sooraj Sasindran
66b9465fc8 Merge "NITZ API improvement" am: bb347323d0 am: 4d791aef1b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1839798

Change-Id: I4c33c1e3214fbc837ad43b6ca3b0e3b27f52dbe4
2021-10-27 20:35:49 +00:00
Treehugger Robot
fab5684ffe Merge "Bluetooth HAL: Add missing retry logic to the H4Protocol::Send()" am: 9fec2f0104
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1859827

Change-Id: I516d258184f313497e957f33958eece2c7a30eb9
2021-10-27 20:15:45 +00:00
Sooraj Sasindran
4d791aef1b Merge "NITZ API improvement" am: bb347323d0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1839798

Change-Id: Ia5d297d7692f14bcd761b8b9a42e927270c2ee38
2021-10-27 20:15:38 +00:00
Treehugger Robot
9fec2f0104 Merge "Bluetooth HAL: Add missing retry logic to the H4Protocol::Send()" 2021-10-27 19:53:09 +00:00
Sooraj Sasindran
bb347323d0 Merge "NITZ API improvement" 2021-10-27 19:49:15 +00:00
Sukesh Srikakula
1e2b234392 Bluetooth HAL: Add missing retry logic to the H4Protocol::Send()
As part of an optimization, H4Protocol::Send() is modified to
use writev() instead of WriteSafely(), which has a retry logic
to send remaining bytes if the underlying write() call couldn't
transfer all the bytes in a single system call. This cl is now
adding this missing retry logic to this function.

Bug: 198992020
Test: H4 UTTest, Bluetooth functional test.

Change-Id: I78fad886d52f0910c83b000d5768128f00d3ddbc
2021-10-27 11:21:38 -07:00
Ian Hua
1a1d9d0325 Add FL6 spec tests to AIDL VTS. am: ca46f9768c am: 65a058482b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1866682

Change-Id: Idc24a0482b0d519a10572d236980de1cf50bacc1
2021-10-27 16:20:36 +00:00
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
Yifan Hong
830cdb119e health: Add default impl of health AIDL HAL
Compared to the HIDL HAL implementation,
- libhealthloop (and the HealthLoop class) is kept
- Create libhealthaidlimpl that replaces libhealth2impl. Fork the implementation because
  libhealth2impl is highly coupled with HIDL’s design rationale. This includes forking:
  - HalHealthLoop
  - Health implementation
- Combine the passthrough Health and hwbinder BinderHealth classes into the AIDL
  implementation of Health. This is because AIDL does not support passthrough transport.
  Separating the implementation for the two transports in HIDL does not make sense for AIDL.
- In HIDL, a BinderHealth is a HalHealthLoop which is composed of a (passthrough)
  Health implementation. As a result of this change, in AIDL, a Health implementation
  is a HalHealthLoop, which associates with the Health implementation itself with a raw
  pointer.
- hidl_death_recipient becomes ScopedAIBinder_DeathRecipient
- Callback becomes LinkedCallback

Test: manual
Bug: 177269435
Change-Id: I76e914117ce09b218cdb9d655f2135d29bb629ae
2021-10-26 23:53:55 -07:00
Michael Butler
6109e931d9 Merge changes Iae9f692f,Ib43f1cb6,I9d4f0c30,I7d06ea35 am: 5f14bad22c am: b9aff55ad9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1863342

Change-Id: Ib1a182ec0b8b2f8d5971747eac4ed67c4b0beb24
2021-10-27 00:39:28 +00: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
54a25b2d7c Merge changes from topic "health-aidl" am: 713d22e0f1 am: f802438361
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861824

Change-Id: I7d247c28a9d6270a0d187a326b43bc60e3f5dfa3
2021-10-26 23:15:22 +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
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
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
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
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
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
Aaron Tsai
5b5514b12d NITZ API improvement
- change the parameter description of "receivedTime"
 - add a parameter "ageMs" to represent the caching time in RIL and modem

Bug: 195418175
Test: build pass
Change-Id: I0fabbfabc18aa6acc0285527e254290d8291d9c8
2021-10-26 09:45:39 +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
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