Commit graph

26834 commits

Author SHA1 Message Date
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
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
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
Hsin-Yi Chen
012ae9cccc Merge "Adjust the parameters of accelerometer and hinge angle sensor" am: 3f4034f02b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1517637

Change-Id: If9e9fe78d17d354e3afc1d3db301a8247993d1ef
2020-12-07 02:37:58 +00:00
Hsin-Yi Chen
3f4034f02b Merge "Adjust the parameters of accelerometer and hinge angle sensor" 2020-12-07 02:24:03 +00:00
Xin Li
528369f35d DO NOT MERGE - Mark RQ1A.201004.001 as merged
Bug: 172690556
Change-Id: I11effdf29a2b2f5472aae5871f9b1cf12bbe6fbd
2020-12-06 14:43:21 -08:00
Mingming Cai
11a9329702 Merge "Update Hal 1.6 for updated SignalStength" am: 2682ae4273
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1517057

Change-Id: Idb9daf7edd62da2442a7d51fa2032b5c839c8cb2
2020-12-05 02:25:08 +00:00
Mingming Cai
2682ae4273 Merge "Update Hal 1.6 for updated SignalStength" 2020-12-05 02:15:08 +00:00
Treehugger Robot
ad9cfea07a Merge "Change setDataThrottling window parameter to a long millisecond." am: c8bf0854a4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1510231

Change-Id: I590f8330170aed00293129e29d247ae46427a240
2020-12-04 21:42:42 +00:00
Treehugger Robot
c8bf0854a4 Merge "Change setDataThrottling window parameter to a long millisecond." 2020-12-04 21:25:08 +00:00
Treehugger Robot
cce79769b0 Merge "Move VtsHalNeuralnetworksV1_2/3TargetTest to group presubmit-large" am: f962520e70
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1516749

Change-Id: Ie6fd4c6eaacf07bccd4f03b3a48d40c71b8226f5
2020-12-04 20:28:26 +00:00
Treehugger Robot
f962520e70 Merge "Move VtsHalNeuralnetworksV1_2/3TargetTest to group presubmit-large" 2020-12-04 19:58:36 +00:00
Shawn Willden
7751d10d7f Delete keymaster0
Test: Build
Change-Id: I2ffb10978af9add7792faff0675bd013d96b35b8
2020-12-04 11:53:06 -07:00
Hayden Gomes
4e7d69e751 Changing package for audio_policy_configuration_V7_0
- Changed package to use android. prefix
- Added nullability flag to xsd_config

Bug: 171572311
Test: built and atest VtsHalAudioEffectV7_0TargetTest
VtsHalAudioEffectV7_0TargetTest VtsHalAudioEffectV4_0TargetTest
VtsAidlHalAudioControlTest

Change-Id: I9ac83a98256404313b5efef17c0a164d2ee72136
Merged-In: I9ac83a98256404313b5efef17c0a164d2ee72136
2020-12-04 16:50:37 +00:00
Hsin-Yi Chen
92f8f4847a Adjust the parameters of accelerometer and hinge angle sensor
This commit fixes the following CTS failures:
CtsSensorTestCases:android.hardware.cts.SingleSensorTests#testSensorProperties
CtsSensorTestCases:android.hardware.cts.SensorTest#testSensorOperations

Test: atest VtsHalSensorsV2_0TargetTest
Test: atest VtsHalSensorsV2_1TargetTest
Test: atest CtsSensorTestCases
Bug: 169548171
Change-Id: Ie295a06a539ed6788bdff0f9c936a4186e5f1d0f
2020-12-04 09:55:51 +00:00
Tianjie Xu
f880de9ab1 Merge "Extend the bootcontrol HAL to get the active slot" am: 5919616361
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1513020

Change-Id: I599c047f4bbbcadc5e750a13addf9319d9a07d64
2020-12-04 07:36:01 +00:00
Tianjie Xu
5919616361 Merge "Extend the bootcontrol HAL to get the active slot" 2020-12-04 07:11:00 +00:00
Hsin-Yi Chen
d9477a4554 Merge "Set default value for pressure sensor" am: e07fd9fce2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1515727

Change-Id: I6f9489297d70940b9cfe8650ced59999e152b0a5
2020-12-04 04:12:17 +00:00
Hsin-Yi Chen
e07fd9fce2 Merge "Set default value for pressure sensor" 2020-12-04 02:42:31 +00:00
Tianjie
01d460b408 Extend the bootcontrol HAL to get the active slot
The existing HAL has a setter, but no getter for the active slot for
next boot. The information is useful. For example, clients may need
to figure out which build the device will boot into.

In the resume on reboot case, we want to put the vbmeta digest
together with an encrypted key. And the vbmeta digest is associated
with a set of images (depending on which slot to boot into).

Bug: 173808057
Test: run vts test on cuttlefish
Change-Id: Ia8578926c781eb8e006589f45ab35a95dfe4f9a0
2020-12-03 15:18:40 -08:00
Mingming Cai
20a2f420fb Update Hal 1.6 for updated SignalStength
Update Hal IRadio, IRadioResponse, and IRadioIndiction
for the updated SignalSterength.
Move radio_responce#getSignalStrengthResponse_1_4 to the right block

Bug: 174775680
Test: atest VtsHalRadioV1_6TargetTest
Change-Id: If61ff4f72b44ac5482acd1823153633d5f9bfce9
2020-12-03 13:05:29 -08:00
Treehugger Robot
a5d5bf1338 Merge "composer: fix 2.4 vts for multi-display" am: cd563ba0c5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1515694

Change-Id: I653a7532cd5de87a04f5bff17cc8c7e1c57fa410
2020-12-03 20:16:54 +00:00
Treehugger Robot
f977c1be53 Merge "Camera: fix HAL1 removeCamera crash" am: 2b8f95789e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1515921

Change-Id: I687e22222e2228a91b0364efae51277cf6cd9c4a
2020-12-03 20:15:24 +00:00
Treehugger Robot
cd563ba0c5 Merge "composer: fix 2.4 vts for multi-display" 2020-12-03 20:12:27 +00:00
Dan Shi
8d643a458f Move VtsHalNeuralnetworksV1_2/3TargetTest to group presubmit-large
The test config takes longer than 15mins to run. Move it to a dedicated
group for running slow presubmit Test Mapping test.

Bug: 174654670
Test: none
Change-Id: I11574377ed28676475321c4c84feccf5b33f08c3
2020-12-03 12:10:46 -08:00
Mingming Cai
e9fa46f49f Merge "Add CQI and CQI Table Index to Hal 1.6" am: a0e7918d8a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1489837

Change-Id: I7a4c8fa4f72bbea9ec9e9ec8c2fd93dd8d57f74f
2020-12-03 20:07:15 +00:00