Commit Graph

27044 Commits

Author SHA1 Message Date
Treehugger Robot
01d8352de2 Merge changes from topic "aosp-default-wrapper" am: 6c1dd66442 am: 14e3969067
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526845

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06119c38489e3a638872b734b9c2c978f5383cad
2020-12-14 09:43:26 +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
Treehugger Robot
6c1dd66442 Merge changes from topic "aosp-default-wrapper"
* changes:
  audio: Use docstrings instead of comments in types.hal files
  Implement a.h.audio.common@7.0-util module
  Move UUID conversions into their own class
2020-12-14 08:55:22 +00:00
Amit Mahajan
efe5ac8aa4 Merge "Receive forwarded number from Modem" am: d35457c922 am: 131389f6ab
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/813457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id59e0b5c8a2863218b08edb0a743c21b7da5579e
2020-12-14 08:21:16 +00:00
Amit Mahajan
131389f6ab Merge "Receive forwarded number from Modem" am: d35457c922
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/813457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib042e9210a197382a926b2c38e325f9cc6dad957
2020-12-14 08:05:09 +00:00
Amit Mahajan
d35457c922 Merge "Receive forwarded number from Modem" 2020-12-14 07:48:41 +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
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
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
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
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
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
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
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
Steven Moreland
9404ba8923 Merge "Remove ignored annotations." am: 8523de7588 am: 2bb38c61f0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1519066

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c04325021abb048583ec1a28169505fe8d594ef
2020-12-09 21:08:02 +00:00
Steven Moreland
2bb38c61f0 Merge "Remove ignored annotations." am: 8523de7588
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1519066

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3392a718ae479ff09d42c49c4c9a5e1c2eb6c81a
2020-12-09 20:52:46 +00:00
Steven Moreland
8523de7588 Merge "Remove ignored annotations." 2020-12-09 20:45:09 +00:00
Roman Kiryanov
ecb6fb64a9 (reland) Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib
libqemu_pipe is an implementation detail in
android.hardware.automotive.vehicle@2.0-default-impl-lib
and not exposed to the outside.

Bug: 175046060
Bug: 154348162
Test: m android.hardware.automotive.vehicle@2.0-virtualization-service
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I769da5d707e378ce212b9957ea5c116b08eae382
2020-12-09 12:27:27 -08:00
Roman Kiryanov
614b6e16d2 Merge "Revert "Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib"" am: b22fba9f02 am: 936f30e611
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520552

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I287dc70280139f9709fa9380dda52cffbae8ea08
2020-12-09 02:45:44 +00:00
Roman Kiryanov
936f30e611 Merge "Revert "Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib"" am: b22fba9f02
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520552

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic02f901a685892c62beef6df0e4775e4723d2b3e
2020-12-09 02:14:46 +00:00
Roman Kiryanov
b22fba9f02 Merge "Revert "Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib"" 2020-12-09 00:46:34 +00:00
Roman Kiryanov
d03966ab30 Revert "Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib"
Revert "Remove dependency on libqemu_pipe"

Revert submission 1518674-car-no-qemu-pipe

Reason for revert: b/175157953
Reverted Changes:
Iac833becd:Remove dependency on libqemu_pipe
I00de16c55:Link libqemu_pipe into a.h.a.vehicle@2.0-default-i...

Change-Id: Icd5d21576479fd250e95955222ebca20e665bb3f
2020-12-09 00:39:45 +00:00
Treehugger Robot
856be03fc7 Merge "Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib" am: b2670c6f88 am: 5d2db50930
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1518674

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e7979204dabf710354e821f0793342b8745b5e2
2020-12-08 23:58:48 +00:00
Treehugger Robot
5d2db50930 Merge "Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib" am: b2670c6f88
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1518674

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c02424f46053d8dc85f6592669344ec1a81f062
2020-12-08 23:33:58 +00:00
Treehugger Robot
b2670c6f88 Merge "Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib" 2020-12-08 23:04:59 +00:00