Commit graph

26857 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Michael Butler
9c51fc5008 Cleanup how transport errors are handled in NN utils am: cca3e20e23
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520619

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2169736497307733894bb3eda7861a8ee49da93
2020-12-08 18:14:54 +00:00
Michael Butler
ee3a8f4970 Validate during NN conversions by default -- hal am: 6547b2ac9c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520618

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45ef02b75be65c38c6504538b5d30e88b2d2c47f
2020-12-08 18:14:01 +00:00
Michael Butler
cca3e20e23 Cleanup how transport errors are handled in NN utils
Prior to this change, whenever the NN utility code encountered a HIDL
transport error, the error message would display the file and line
number of the "handleTransportError" function itself. This change
introduces a new macro "HANDLE_TRANSPORT_FAILURE" that handles the
transport error in a similar way but now the error message displays
the file and line number of where the macro is called.

Bug: N/A
Test: mma
Change-Id: I35b34f8f5be52b7fcff0fbb58a37ab2b8c7dd8bb
Merged-In: I35b34f8f5be52b7fcff0fbb58a37ab2b8c7dd8bb
(cherry picked from commit 61f508e018)
2020-12-07 22:38:16 -08:00
Michael Butler
6547b2ac9c Validate during NN conversions by default -- hal
This change renames all `convert` functions to `unvalidatedConvert`.
This change also introduces new `convert` functions that act only on the
types that appear in the NN HIDL methods directly. These new `convert`
functions perform validation. Specifically, if either the source or
destination value is invalid, then the conversion fails.

Bug: 160667419
Test: mma
Test: NeuralNetworksTest_static
Change-Id: I492956ff60ad1466c67893993d28cdd6f3860708
Merged-In: I492956ff60ad1466c67893993d28cdd6f3860708
(cherry picked from commit 32acc06144)
2020-12-07 22:37:28 -08:00
Roman Kiryanov
aa5e7bcd13 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.

libqemu_pipe module will be replaced with one
from device/generic/goldfish.

Bug: 175046060
Test: m android.hardware.automotive.vehicle@2.0-virtualization-service
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I00de16c55797e3aaf650aee6d0ec400fd12c2de2
2020-12-07 14:15:42 -08:00
Steven Moreland
5700685f01 Remove ignored annotations.
HIDL never validated these, and these will be logspam/errors now (error
for interfaces where a new annotation, @SensitiveData, is important not
to have typoes, but warnings where otherwise the annotation is
inconsequential).

Bug: 173732508
Test: builds w/o warnings/errors
Change-Id: Ic95d58098fa0104a3a7f1c85644ab1a015bcdd19
2020-12-07 21:23:12 +00:00
Treehugger Robot
b5cb89cfbf Merge "Changing package for audio_policy_configuration_V7_0" am: a173639924
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1518401

Change-Id: I70139a32c4e58d29b63b43e41c79af897dfa0df6
2020-12-07 19:08:24 +00:00
Treehugger Robot
a173639924 Merge "Changing package for audio_policy_configuration_V7_0" 2020-12-07 18:35:21 +00:00
Xin Li
c371fcd552 DO NOT MERGE - Merge RQ1A.201205.011
Bug: 172690556
Merged-In: I3962ede51ce823368c62c4e4e5fb30f7a5680bdf
Change-Id: Ia68bf79ad9a0782e2818a2abfda69ad0d2122101
2020-12-07 00:39:42 -08:00
TreeHugger Robot
b9a958831d Merge "DO NOT MERGE - Mark RQ1A.201004.001 as merged" into stage-aosp-master 2020-12-07 03:40:43 +00:00
Treehugger Robot
1aeea8c95b Merge "Delete keymaster0" am: 02cdce19c1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1515113

Change-Id: I3ed294c69ce86a036110fb5c5a95fb6f5737ac07
2020-12-07 03:22:47 +00:00
Treehugger Robot
02cdce19c1 Merge "Delete keymaster0" 2020-12-07 02:47:29 +00:00
Shinsuke Ishioka
ede1e95b6c Receive forwarded number from Modem
Adds forwarded number to Call information

Update 1.6 HAL:
- Added Call
- Added getCurrentCalls_1_6
- Added getCurrentCallsResponse_1_6

Test: Build pass.
Bug: 29063067

Change-Id: I8e43439e5638b7820d156d8fc6fe963cf1edf6f0
2020-12-07 11:46:46 +09:00