Commit graph

29440 commits

Author SHA1 Message Date
Shawn Willden
1d3f85e891 Various cleanups
Mostly just removal of old-style #include guards in favor of #pragm
once, reorganization of header includes, correction of copyright
years, etc.

Test: VtsAidlKeyMintTargetTest
Change-Id: I070584ecec550a2f133b1c19f36f99e7b5544e7c
2020-12-13 23:48:10 -07:00
Jimmy Chen
ed0d49d277 Merge "hostapd: add 60GHz(WiGig) support" 2020-12-12 04:26:03 +00:00
Shawn Willden
3c1c203105 Revert^2 "Move keymint to android.hardware.security." am: 08a7e43e78 am: dbd149504f am: 5b8443fb65
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0181729ff6b700b05983d48f10bbe5299426db85
2020-12-12 01:07:06 +00:00
Shawn Willden
5b8443fb65 Revert^2 "Move keymint to android.hardware.security." am: 08a7e43e78 am: dbd149504f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05ab743bf2e0f0be39e93591c0832c8cc9116931
2020-12-12 00:49:57 +00:00
Shawn Willden
dbd149504f Revert^2 "Move keymint to android.hardware.security." am: 08a7e43e78
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf583a13e67e08e7d1d812544a3cdaa165d4ad3a
2020-12-12 00:26:10 +00:00
Kevin Chyn
4e7c016758 Change default face sensorId to 4
Fixes: 174816040
Test: atest CtsBiometricsTestCases
Change-Id: Ib3139dd10752f488ac9da220e8ab5d9104279d0f
2020-12-11 15:45:54 -08:00
Mikhail Naganov
ec5df2d747 audio: Use docstrings instead of comments in types.hal files
Converted comments into docstrings for enums and structures
in Audio HAL V7 definition.

Bug: 142480271
Test: m
Change-Id: Id5e36e7a42e2600ab69612819f8260110871c711
Merged-In: Id5e36e7a42e2600ab69612819f8260110871c711
2020-12-11 22:10:50 +00:00
Mikhail Naganov
1b444a5332 Implement a.h.audio.common@7.0-util module
This includes a rewrite of HidlUtils for V7.
A unit test is added for its conversion functions.

Made necessary minor adjustments to the HAL V7 types.
Also, fixed definition of 'audioFormatsList' to allow for
vendor extensions.

Bug: 142480271
Bug: 173647783
Test: m && atest android.hardware.audio.common@7.0-util_tests
Change-Id: Ib883f1c246fce78c004846516699aa724d4b5d44
Merged-In: Ib883f1c246fce78c004846516699aa724d4b5d44
2020-12-11 22:10:10 +00:00
Mikhail Naganov
4122f6328a Move UUID conversions into their own class
Mechanical extraction of HidlUtils::uuidFrom/ToHal into
a dedicated class UuidUtils.

Bug: 142480271
Test: m
Change-Id: Ic5333ba32dc293f32c5562d0ef05bde8e5f9b302
Merged-In: Ic5333ba32dc293f32c5562d0ef05bde8e5f9b302
2020-12-11 22:09:43 +00:00
Mikhail Naganov
9036edac04 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
2020-12-11 14:05:10 -08:00
Mikhail Naganov
77d6f101e7 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
2020-12-11 14:05:10 -08:00
Yomna Nasser
e8bfa9c4e1 Add getAllowedNetworkTypesBitmap HAL API
Adds corresponding query API getAllowedNetworkTypesBitmap to
existing setAllowedNetworkTypeBitmap.

Test: atest
Bug: 171791177
Change-Id: Ib8f0075dda41d4876a14f7223a067e34626a4675
Merged-In: Ib8f0075dda41d4876a14f7223a067e34626a4675
2020-12-11 21:18:31 +00:00
Shawn Willden
08a7e43e78 Revert^2 "Move keymint to android.hardware.security."
1ffcdebadd

Bug: 175345910
Bug: 171429297
Exempt-From-Owner-Approval: re-landing topic with no changes in this CL.
Change-Id: I691cad252f188b54a8076589d9955774d74d4729
2020-12-11 20:36:59 +00:00
Orion Hodson
0dc2d4a695 Merge "Revert "Move keymint to android.hardware.security."" am: 495ceb90fd am: fdc32ed322 am: e0a4966342
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc28b0d25485ada9d78d2732ee742c4e5195ace4
2020-12-11 14:02:27 +00:00
Orion Hodson
e0a4966342 Merge "Revert "Move keymint to android.hardware.security."" am: 495ceb90fd am: fdc32ed322
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I466a533429cfa32372a2be3e885ec53339eb999c
2020-12-11 13:31:38 +00:00
Orion Hodson
fdc32ed322 Merge "Revert "Move keymint to android.hardware.security."" am: 495ceb90fd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff93d3ee047dc5dc5584d944e1e9a0a3d639cbc8
2020-12-11 12:51:16 +00:00
Orion Hodson
495ceb90fd Merge "Revert "Move keymint to android.hardware.security."" 2020-12-11 12:29:46 +00:00
Changyeon Jo
a1bd1c9690 Correct EVS VTS test case am: cf0e945ac2 am: 0e9bb861a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13195161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cb8308ecf866e4ec5046d17b697b119573c35d7
2020-12-11 11:07:37 +00:00
Treehugger Robot
feb8908fb0 [automerger skipped] Merge changes from topic "aosp-audio-base-h" am: f3ff53da1a am: 962bd5be93 am: ff99be2e34 -s ours
am skip reason: Change-Id I2bf250ef9154a7ae86679afa566c80dfd01f1d5b with SHA-1 9d9f970ee4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic433846b3ab5bac27814a3dfef0305e48f70a497
2020-12-11 11:07:21 +00:00
Mikhail Naganov
760227c5e3 [automerger skipped] Make audio*-base.h files autogenerated again am: 2287a249a6 am: 19dae82311 am: 9b93d31ba7 -s ours
am skip reason: Change-Id I8c017912395a03beacea077fd562fae2329ad975 with SHA-1 a5273c760c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76197be3dec8237e4e734fba8f6b100cac41775f
2020-12-11 11:07:19 +00:00
Shawn Willden
78a9a6c37a Merge "Move keymint to android.hardware.security." am: 0a89757936 am: 640d1c8a40 am: 5a1001361d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1519122

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60faca04b21a15a3a30d1a0f1d1022363e5f9ace
2020-12-11 11:01:04 +00:00
Orion Hodson
1ffcdebadd Revert "Move keymint to android.hardware.security."
Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."

Revert "Keystore 2.0: Move keymint spec to security namespace."

Revert "Keystore 2.0: Move keymint spec to security namespace."

Revert "Move keymint to android.hardware.security."

Revert "Configure CF to start KeyMint service by default."

Revert "Move keymint to android.hardware.security."

Revert "Move keymint to android.hardware.security."

Revert submission 1522123-move_keymint

Reason for revert: Build breakage
Bug: 175345910
Bug: 171429297
Reverted Changes:
Ief0e9884a:Keystore 2.0: Move keymint spec to security namesp...
Idb54e8846:Keystore 2.0: Move keymint spec to security namesp...
I9f70db0e4:Remove references to keymint1
I2b4ce3349:Keystore 2.0 SPI: Move keymint spec to security na...
I2498073aa:Move keymint to android.hardware.security.
I098711e7d:Move keymint to android.hardware.security.
I3ec8d70fe:Configure CF to start KeyMint service by default.
Icbb373c50:Move keymint to android.hardware.security.
I86bccf40e:Move keymint to android.hardware.security.

Change-Id: I160cae568ed6b15698bd0af0b19c6c949528762d
2020-12-11 10:45:43 +00:00
Jack Yu
f916560188 Extend test timeout value from 180s to 600s
There are several test cases that may take longer duration to complete.
Extend the timeout value to ensure there is sufficient running duration.

Bug: 174717076
Test: atest VtsHalNfcV1_0TargetTest
Change-Id: I4fc15184f0715131c45247820e1edbaae511b8a3
2020-12-11 16:01:45 +08:00
Eric Laurent
68d0c71b5b Merge "audio HAL: add output flag indicating support for gapless transitions" 2020-12-11 07:09:29 +00:00
Mikhail Naganov
7236d0760a 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
2020-12-10 17:30:09 -08:00
Changyeon Jo
0e9bb861a7 Correct EVS VTS test case am: cf0e945ac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13195161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14de6689ac73c5f3c72cdb0959dae5bee96f8280
2020-12-11 01:16:38 +00:00
Treehugger Robot
ff99be2e34 Merge changes from topic "aosp-audio-base-h" am: f3ff53da1a am: 962bd5be93
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522145

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8427c43c1573e126a20f67096e31badae9d75135
2020-12-10 23:50:26 +00:00
Mikhail Naganov
9b93d31ba7 Make audio*-base.h files autogenerated again am: 2287a249a6 am: 19dae82311
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522144

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77d0c82c86c5fa6dbf4b155bbbdcfbda879f5d63
2020-12-10 23:50:25 +00:00
Shawn Willden
5a1001361d Merge "Move keymint to android.hardware.security." am: 0a89757936 am: 640d1c8a40
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1519122

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10f92fa6fe76da15f9093d23a71d9c7456db5b10
2020-12-10 23:49:39 +00:00
Treehugger Robot
962bd5be93 Merge changes from topic "aosp-audio-base-h" am: f3ff53da1a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522145

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I892a5901dbbbc500c0f213c12eded4996ade8ffc
2020-12-10 23:23:37 +00:00
Mikhail Naganov
19dae82311 Make audio*-base.h files autogenerated again am: 2287a249a6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522144

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18554b1e063b25306de2bfa9c22460304022d9b8
2020-12-10 23:22:50 +00:00
Shawn Willden
640d1c8a40 Merge "Move keymint to android.hardware.security." am: 0a89757936
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1519122

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If245d36a260deff9d2b98add6b114a2afac7353a
2020-12-10 23:17:32 +00:00
Treehugger Robot
f3ff53da1a Merge changes from topic "aosp-audio-base-h"
* changes:
  audio: Add @export annotations to microphone-related enums
  Make audio*-base.h files autogenerated again
2020-12-10 22:57:35 +00:00
Shawn Willden
0a89757936 Merge "Move keymint to android.hardware.security." 2020-12-10 22:49:14 +00:00
Hayden Gomes
5ac252bafc Merge "Use enumerator for AudioFocusChange" 2020-12-10 20:37:59 +00:00
Yomna Nasser
a1a42d767a Merge "Add getAllowedNetworkTypesBitmap HAL API" 2020-12-10 16:52:02 +00:00
Kalesh Singh
f4ab018143 Memtrack HAL: Add stable AIDL implementation
Bug: 175021432
Test: adb shell dumpsys -l | grep android.hardware.memtrack.IMemtrack
Test: VtsHalMemtrackTargetTest
Change-Id: Ib6c634def4eeca62b0b2615dc7dc273183cda2b1
2020-12-10 10:10:19 -05:00
TreeHugger Robot
b33cad6087 Merge "Add SEAT_OCCUPANCY property into google VHAL" 2020-12-10 07:45:22 +00:00
Roman Kiryanov
1e80aa1ace Merge "(reland) Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib" am: 46ca02f425 am: 9da9beb860 am: 80ab19e2c4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522197

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02c005ba57c51c205a4460569dc7ba0dcea50b40
2020-12-10 05:18:23 +00:00
Roman Kiryanov
80ab19e2c4 Merge "(reland) Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib" am: 46ca02f425 am: 9da9beb860
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522197

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6945f7d43e067a52a6d5a1da4d2cd0ce6eec288
2020-12-10 05:01:14 +00:00
Roman Kiryanov
9da9beb860 Merge "(reland) Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib" am: 46ca02f425
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522197

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I027a0ebc4593cc537cccf6e901589f5735f8e13b
2020-12-10 04:35:49 +00:00
Roman Kiryanov
46ca02f425 Merge "(reland) Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib" 2020-12-10 04:15:58 +00:00
Xin Li
8f210e810a [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: abf2b89f2d -s ours am: 145c97fbaf -s ours am: 6bcf14f5fa -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10753ba00fbe39f0c45a3ab1e9fc2d5333c39631
2020-12-10 03:59:02 +00:00
Xin Li
6bcf14f5fa [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: abf2b89f2d -s ours am: 145c97fbaf -s ours
am skip reason: Change-Id I3392a718ae479ff09d42c49c4c9a5e1c2eb6c81a with SHA-1 2bb38c61f0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14f3dbb45390715e87684e0ac14e91c063e0962d
2020-12-10 03:47:01 +00:00
Xin Li
145c97fbaf [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: abf2b89f2d -s ours
am skip reason: Change-Id I3392a718ae479ff09d42c49c4c9a5e1c2eb6c81a with SHA-1 2bb38c61f0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I871f46f45f88deddc7d29eb7fbc0fbf02fc52f66
2020-12-10 03:05:45 +00:00
Xin Li
abf2b89f2d DO NOT MERGE - Merge Android R QPR1
Bug: 172690556
Merged-In: I3392a718ae479ff09d42c49c4c9a5e1c2eb6c81a
Change-Id: I15884712eecc60ed20710b907e3b93f209a51875
2020-12-09 17:44:05 -08:00
Changyeon Jo
cf0e945ac2 Correct EVS VTS test case
This change updates CameraOpenClean test case to handle logical camera
devices properly when it attempts to set and get an extended info.

Fix: 175260026
Test: atest VtsHalEvsV1_1TargetTest
Change-Id: Ie18436afa722dd24abcaa1a4e0180955827ee499
2020-12-09 17:43:12 -08:00
Mikhail Naganov
37d78b45e7 audio: Add @export annotations to microphone-related enums
This addresses long-standing TODOs in system/audio.h.
Annotated the following enums:

 - AudioMicrophoneChannelMapping;
 - AudioMicrophoneLocation;
 - AudioMicrophoneDirectionality.

This allows removing hand-written conversion functions
since the values are guaranteed to match between HIDL and
system/audio.h.

Bug: 122858783
Test: m
Change-Id: I2bf250ef9154a7ae86679afa566c80dfd01f1d5b
Merged-In: I2bf250ef9154a7ae86679afa566c80dfd01f1d5b
2020-12-09 23:37:48 +00:00
Mikhail Naganov
2287a249a6 Make audio*-base.h files autogenerated again
Major change: audio-base.h is generated from "core" types.hal,
new file audio_common-base.h is generated from "common" types.hal.

In order to be able to add system-only constants to generated
enums, the latter are made anonymous, values got "HAL_" prefix.
Then in system/audio.h a full enum is constructed.

Removed audio_drain_type_t from exported, as it belongs to
libhardware only.

Added missing enums that were introduced at the system side
only in Android R.

Bug: 122858783
Test: m
Change-Id: I8c017912395a03beacea077fd562fae2329ad975
Merged-In: I8c017912395a03beacea077fd562fae2329ad975
2020-12-09 23:36:48 +00:00
Shawn Willden
f73e952ea4 Move keymint to android.hardware.security.
Test: VtsAidlKeyMintTargetTest
Change-Id: I2498073aa834584229e9a4955a97f279a94d1dd5
2020-12-09 16:26:41 -07:00