Commit graph

26907 commits

Author SHA1 Message Date
Treehugger Robot
90ea1579e2 Merge "Revise keymint_tags.h" am: 2528ddcab2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a03d4caa6a7641ede077511a3cc6da7e55475bd
2020-12-21 18:41:30 +00:00
Treehugger Robot
268ef54b1a Merge "Change KeyParameters to use a union." am: d389d1659a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520082

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4e01b51cd86c965b5869bcf26fba95e9a74465a
2020-12-21 18:37:15 +00:00
Treehugger Robot
2528ddcab2 Merge "Revise keymint_tags.h" 2020-12-21 18:11:08 +00:00
Treehugger Robot
d389d1659a Merge "Change KeyParameters to use a union." 2020-12-21 18:10:58 +00:00
Mikhail Naganov
8929cd8573 Merge "Audio VTS: Improve stability, update config validation test" am: 65dc8832cf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1531970

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I324c16680e9f9e6d080e42df15e3b7106963f7eb
2020-12-21 17:55:22 +00:00
Mikhail Naganov
65dc8832cf Merge "Audio VTS: Improve stability, update config validation test" 2020-12-21 17:28:31 +00:00
Treehugger Robot
24f8ba41c4 Merge "Keymint: Use ndk_platform." am: dfe843477b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1532211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I317383dbc4d6be31f3bb71523a402847c4132e89
2020-12-19 12:34:30 +00:00
Treehugger Robot
dfe843477b Merge "Keymint: Use ndk_platform." 2020-12-19 12:22:37 +00:00
Janis Danisevskis
5ba093377c Revise keymint_tags.h
* replace NullOr with std::optional.
* Add mising tag.
* Undefine helper macros so that keymint_tags.h can be used together
  with keymaster_tags.h
* Check if KeyParameterValue variant matches KeyParameterTag in
  accessors.

Test: VtsAidlKeyMintTargetTest
Change-Id: I6c951071f30fd27c8c21a2e8cc86f421a3bc37d9
2020-12-18 08:34:20 -08:00
Shawn Willden
83fa6413ac Change KeyParameters to use a union.
AIDL now supports union types.  This CL changes KeyParameter to use
one.

Test: VtsAidlKeyMintTargetTest
Change-Id: I5112611b161e3de1ea86105ea3c7ed0912036a7b
2020-12-18 08:38:28 -07:00
Treehugger Robot
d694491190 Merge "Add android-5.10 support for S" am: 69c290564a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1531285

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib081b232aa2e3ce8f8e8d7fd04ecb59ca2e27d11
2020-12-17 20:31:56 +00:00
Treehugger Robot
69c290564a Merge "Add android-5.10 support for S" 2020-12-17 20:12:00 +00:00
Janis Danisevskis
24c0470408 Keymint: Use ndk_platform.
Test: N/A
Change-Id: I7e97d9d475a639cfe92c9e6b01689c9ff80d2abc
2020-12-17 11:34:59 -07:00
Mikhail Naganov
79903fea44 Audio VTS: Improve stability, update config validation test
Major challenge: the configuration of HAL tests
depends on the APM XML configuration file which may be
invalid. The code that reads the configuration
has been updated to avoid crashes when the config
is invalid.

In CheckConfig_audioPolicyConfigurationValidation the
dependency on the config parser was removed. Previously,
a failure to parse the config by the config parser would
lead to the test being skipped, which isn't correct
as it must fail in this case.

Minor fixes to V7 tests to pass on a real life legacy HAL.

Bug: 36733185
Test: run VtsHalAudioV7_0TargetTest on a device with V6
Test: run VtsHalAudioV7_0TargetTest on a device with
      a side-loaded V7 and invalid APM config file
Test: run VtsHalAudioV7_0TargetTest on a device with
      a side-loaded V7
Change-Id: I746339ff69ab455dc64eef9a17827d047b357329
2020-12-16 15:30:28 -08:00
Steven Moreland
f1715f4b0b Merge "Update OWNERS for 2020" am: a9cfd015bf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1532199

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3de96b97b85c9883857ed4721ac1bda086c588e7
2020-12-16 23:00:57 +00:00
Steven Moreland
a9cfd015bf Merge "Update OWNERS for 2020" 2020-12-16 22:19:25 +00:00
Treehugger Robot
ca4161df7f Merge changes from topic "aosp-default-wrapper" am: dbb1258329
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530606

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d8752d7ae3e70f93040565252222eb5ad5551be
2020-12-16 20:54:06 +00:00
Mikhail Naganov
3fe3f23a47 audio: Update default effect HAL wrapper to support V7 am: f363ed4f96
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I825d9c269a8136803a49be473c3bc061bfbac066
2020-12-16 20:54:03 +00:00
Mikhail Naganov
5efd34043e audio: Update default wrapper to support V7 am: e1a9c8f8b8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530604

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If05857dbab8f961fd8cb0f7daa6a6c5246422b7e
2020-12-16 20:54:00 +00:00
Mikhail Naganov
2dfe070154 audio: Extend HidlUtils for the default wrapper needs am: b52e93f516
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530603

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia686c7ede8e9d938281fa660403be220f08c8f49
2020-12-16 20:53:09 +00:00
Treehugger Robot
dbb1258329 Merge changes from topic "aosp-default-wrapper"
* changes:
  HidlUtils: remove temporary conversion functions
  audio: Update default effect HAL wrapper to support V7
  audio: Update default wrapper to support V7
  audio: Extend HidlUtils for the default wrapper needs
2020-12-16 20:05:07 +00:00
Steven Moreland
7479f38654 Update OWNERS for 2020
- remove ex-Android (yim@)
- add devinmoore@ (new native API counciler)
- cleanup format

Bug: N/A
Test: N/A
Change-Id: I23400850e2fbbeae95c7eeb9241f69b0c05c8fd4
2020-12-16 18:09:12 +00:00
Treehugger Robot
29a6aa191d Merge "Extend test timeout value from 180s to 600s" am: 276369a3df
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16ae7e3114b89738237b8ab6d1cbe586162663e9
2020-12-16 04:00:45 +00:00
Treehugger Robot
276369a3df Merge "Extend test timeout value from 180s to 600s" 2020-12-16 03:18:58 +00:00
Mikhail Naganov
bae2336665 HidlUtils: remove temporary conversion functions
Remove temporary conversion functions and update
the code that was using them.

Bug: 142480271
Test: m
Change-Id: Idf36dbac398efbc03bd6da68c79f6fb1ddc24e9c
Merged-In: Idf36dbac398efbc03bd6da68c79f6fb1ddc24e9c
2020-12-16 01:14:03 +00:00
Mikhail Naganov
f363ed4f96 audio: Update default effect HAL wrapper to support V7
During this conversion, the functionality of the V7 wrapper
hasn't been tested yet. This will be done in a separate CL
that will also include required updates to the VTS tests.

Since the changes were made to the code shared with pre-V7
versions, verified that V6 HAL didn't regress.

Bug: 142480271
Test: atest VtsHalAudioEffectV6_0TargetTest
Test: m VtsHalAudioEffectV7_0TargetTest
Test: m android.hardware.audio@7.0-service.example
Change-Id: I72389c8d564596bef22b47dfdcb2e77d636ef0a3
Merged-In: I72389c8d564596bef22b47dfdcb2e77d636ef0a3
2020-12-16 01:14:02 +00:00
Mikhail Naganov
e1a9c8f8b8 audio: Update default wrapper to support V7
During this conversion, the functionality of the V7 wrapper
hasn't been tested yet. This will be done in a separate CL
that will also include required updates to the VTS tests.

Since the changes were made to the code shared with pre-V7
versions, verified that V6 HAL didn't regress.

Bug: 142480271
Test: atest VtsHalAudioV6_0TargetTest
Test: m VtsHalAudioV7_0TargetTest
Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-16 01:14:02 +00:00
Mikhail Naganov
b52e93f516 audio: Extend HidlUtils for the default wrapper needs
Add conversions used by the default wrapper.

Promote some conversions to pre-V7 interface to reduce
version-based forking in the default wrapper code.

Bug: 142480271
Test: atest android.hardware.audio.common@7.0-util_tests
Change-Id: I93c482eeaf08442271be2656693be5395ca53762
Merged-In: I93c482eeaf08442271be2656693be5395ca53762
2020-12-16 01:14:02 +00:00
Kalesh Singh
34277b9a6b Merge "Revert "Memtrack HAL: Add stable AIDL implementation"" am: b2a38b62b5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibea84b7d89297e09a04cc1e008bfa5c41c458103
2020-12-16 01:05:13 +00:00
Kalesh Singh
b2a38b62b5 Merge "Revert "Memtrack HAL: Add stable AIDL implementation"" 2020-12-16 00:48:06 +00:00
Alistair Delva
b724f36b85 Add android-5.10 support for S
Bug: 175707513
Change-Id: I6799b4ba3dad9b4ae6d8fe2646a2f07d24310537
2020-12-15 16:42:56 -08:00
Kalesh Singh
28641ffb08 Revert "Memtrack HAL: Add stable AIDL implementation"
Revert "libmemtrack: Add support for AIDL memtrack HAL"

Revert "Add stable aidl memtrack HAL to product packages"

Revert "Add stable aidl memtrack hal to vndk list"

Revert "Memtrack HAL stable aidl sepolicy"

Revert "Add android.hardware.memtrack-unstable-ndk_platform"

Revert submission 1518702-memtrack-aidl

Reason for revert: Broken tests and boot time regressions
Reverted Changes:
Ic4dd70e2c:Add android.hardware.memtrack-unstable-ndk_platfor...
Iaf99d0ca4:Add stable aidl memtrack HAL to product packages
Iac54ae2ba:Add stable aidl memtrack hal to vndk list
If310210a3:libmemtrack: Add support for AIDL memtrack HAL
Ib6c634def:Memtrack HAL: Add stable AIDL implementation
I5e1d0e006:Memtrack HAL stable aidl sepolicy

Change-Id: I4a9e3522afe9e9189b7eddc9520d5ef2e2b74520
2020-12-16 00:19:38 +00:00
Steven Moreland
32f937623c support lib for libcutils<->NDK AIDL handle am: 74e043ba2d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1528750

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1afc2964856efcb4f2121a0943771313a03b7a0
2020-12-15 17:00:22 +00:00
Treehugger Robot
8e4e5639c9 Merge "Use safe_union correctly" am: baf61434fd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1510995

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89dac63df8547d9609a547cc8081de374505f4eb
2020-12-15 16:59:38 +00:00
Steven Moreland
74e043ba2d support lib for libcutils<->NDK AIDL handle
The native_handle API is notoriously tricky to work with, and this is
expected to be very common. So, adding a small helper library.

Fixes: 175432703
Test: atest libaidlcommonsupport_test
Change-Id: I4a00d2b14fefe6c979ee656e353e117661a1a483
2020-12-15 16:45:20 +00:00
Treehugger Robot
baf61434fd Merge "Use safe_union correctly" 2020-12-15 16:30:44 +00:00
Thiébaud Weksteen
3196c429e0 Merge "Add getAllowedNetworkTypesBitmap HAL API" am: a07d055654
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19bcdf6899fa5929e2d5e90ec16c5de42e669334
2020-12-15 15:50:52 +00:00
Thiébaud Weksteen
a07d055654 Merge "Add getAllowedNetworkTypesBitmap HAL API" 2020-12-15 12:39:51 +00:00
Grzegorz Kołodziejczyk
0f0c5d17d2 Use safe_union correctly
As described in source.android.com/devices/architecture/hidl/safe_union
value must be assigned through generated getter, rather than assigning it directly.

Test: vts-tradefed run vts -m VtsHalBluetoothAudioV2_1TargetTest
Sponsor: jpawlowski@
Bug: 150670922
Change-Id: Iefc7ee98163ec2b3387fc01c3d69c1dcd15e94bc
2020-12-15 11:08:16 +00:00
Treehugger Robot
be07fd2de6 Merge "Memtrack HAL: Add stable AIDL implementation" am: e5d68ba29c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1518666

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida1cbb3f3533182814b867660e25c8b3d0f67089
2020-12-14 19:29:18 +00:00
Treehugger Robot
e5d68ba29c Merge "Memtrack HAL: Add stable AIDL implementation" 2020-12-14 18:36:10 +00:00
Treehugger Robot
61d27ba878 Merge "Remove authorization set serialization." am: 4d13d0027c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520081

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I387ad00c35d8fd9ccba7e7eae3d2128f44cfa7de
2020-12-14 14:50:00 +00:00
Treehugger Robot
482d670ff6 Merge "Move tag type comments where they belong." am: dd9d98c339
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520080

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00227cd2c0119c8f290d71eec04931b9d77895e5
2020-12-14 14:49:50 +00:00
Treehugger Robot
5684571ed3 Merge "Various cleanups" am: 5fb746bc9f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2d8b8d72716aa0e25480f2bbb842d53f13578f2
2020-12-14 14:48:46 +00:00
Treehugger Robot
4d13d0027c Merge "Remove authorization set serialization." 2020-12-14 14:30:52 +00:00
Treehugger Robot
dd9d98c339 Merge "Move tag type comments where they belong." 2020-12-14 14:30:15 +00:00
Treehugger Robot
5fb746bc9f Merge "Various cleanups" 2020-12-14 14:30:10 +00:00
Treehugger Robot
14e3969067 Merge changes from topic "aosp-default-wrapper" am: 6c1dd66442
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526845

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d3825f29120e38398d4343f4b9d469438a63f7a
2020-12-14 09:28:03 +00:00
Mikhail Naganov
117af81896 Implement a.h.audio.common@7.0-util module am: 1b444a5332
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a6e957ad7772bc3b91e13ead896d5ff16dd798a
2020-12-14 09:28:00 +00:00
Mikhail Naganov
1183e86887 Move UUID conversions into their own class am: 4122f6328a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526843

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e1e91851ea559855720a178bbe75df8ae4d8f60
2020-12-14 09:27:07 +00:00