Commit graph

27134 commits

Author SHA1 Message Date
Treehugger Robot
a5ec53d68f Merge "power/stats: Add more energy consumer types" 2021-02-17 22:04:34 +00:00
Benjamin Schwartz
eb214d0328 power/stats: Add more energy consumer types
Adding bluetooth, mobile radio, gnss, and wifi types

Bug: 176117316
Test: build
Change-Id: I6e22c426910c31bd65e2ec7cd569983a0d005007
2021-02-17 12:12:11 -08:00
Benjamin Schwartz
dfd890a101 Merge "power/stats: Clean up warnings" 2021-02-17 19:58:50 +00:00
Shawn Willden
7c13039711 Add KeyPurpose::ATTEST_KEY.
This allows applications to generate their own attestation keys and
then use them to attest other application-generated keys.

Bug: 171845652
Test: VtsAidlKeyMintTargetTest
Change-Id: I32add16dcc2d1b29665a88024610f7bef7e50200
2021-02-17 08:08:27 -07:00
Treehugger Robot
0ace84a193 Merge "Add RemotelyProvisionedComponent HAL." 2021-02-16 23:48:44 +00:00
Kalesh Singh
1c402dca96 Merge "VtsHalMemtrackTargetTest: Update test suite" 2021-02-16 21:08:03 +00:00
Treehugger Robot
eb4b22027b Merge "Fix HidlUtils::deviceAddressToHalImpl for HAL V4--6" 2021-02-16 19:35:36 +00:00
Kalesh Singh
6e2d21dbc2 VtsHalMemtrackTargetTest: Update test suite
"vts-core" has been renamed to "vts"

Bug: 175021432
Test: atest VtsHalMemtrackTargetTest
Change-Id: Idad5d309bc66cf631932bad66c66d5915ba2fe2c
2021-02-16 14:08:43 -05:00
Shawn Willden
274bb55f10 Add RemotelyProvisionedComponent HAL.
Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I51fb01f4c52949c81f3ad2d694a4afdf0fa67788
2021-02-16 07:40:59 -08:00
Treehugger Robot
06811c8124 Merge "Apply aidl_format to NNAPI AIDL interface files" 2021-02-15 17:24:17 +00:00
Treehugger Robot
82d8bdd90d Merge "Add more tests for limited use key feature." 2021-02-15 05:48:12 +00:00
Kalesh Singh
5a52686fd6 Merge "Memtrack HAL: Remove MemtrackType::NUM_TYPES" 2021-02-13 22:35:11 +00:00
Treehugger Robot
34a7139467 Merge changes from topic "keymint_aidl_impl"
* changes:
  Vts tests for earlyBoot and deviceLocked functionality. Test: atest VtsAidlKeyMintTargetTest Bug: b/171287439.
  The aidl changes related to device locked, entryBootEnded and hw info. Test: atest VtsAidlKeyMintTargetTest Bug: b/178222844, 179062062
2021-02-13 22:11:52 +00:00
Mikhail Naganov
32fe782db4 Fix HidlUtils::deviceAddressToHalImpl for HAL V4--6
Ensure that the busAddress field is used as a fallback
for types of devices that may not necessary have it,
e.g. for built-in microphones.

Add a subset of presubmit tests for HidlUtils of V6
similar to the tests for V7.

Bug: 180143301
Test: atest android.hardware.audio.common@6.0-util_tests
Change-Id: I61fca8bd4342fdf496d1ca5bf2d01399fd3d34c7
2021-02-12 15:49:09 -08:00
Kalesh Singh
1bcbf85110 Memtrack HAL: Remove MemtrackType::NUM_TYPES
Remove NUM_TYPES from MemtrackType enum, since this can cause conflicts
if the enum changes.

Use enum_range to iterate the MemtrackType enum.

Bug: 179432507
Test: atest VtsHalMemtrackTargetTest
Change-Id: Iadad3e0547c1c2f6aaf0f55a2d50e4c625a909e0
2021-02-12 11:29:53 -05:00
Lev Proleev
79bd373c10 Apply aidl_format to NNAPI AIDL interface files
The change also updates the generated files using more up-to-date
version of the aidl code generator. This adds copyright notice to the
generated files.

Bug: 180101047
Test: no presubmit hooks erros
Change-Id: I8535eee96078eda3fadcea130f123a9bdbf1edec
2021-02-12 14:58:20 +00:00
Treehugger Robot
9717a37b6a Merge "The implementation of vts and default implementation to support ISecureClock and ISharedSecret AIDLs. Test: atest VtsAidlSecureClockTargetTest, atest VtsAidlSharedSecretTargetTest Bug: b/175136979, b/175141176" 2021-02-12 02:42:35 +00:00
Treehugger Robot
aef57a826a Merge "Identity: Fix breakage caused by recent changes in libsoft_attestation_cert." 2021-02-11 22:42:29 +00:00
Jakub Pawlowski
3d5cd48f92 Disable failing VTS tests
These will be reenabled in patches that add missing implementation

Test: atest VtsHalBluetoothAudioV2_1TargetTest
Bug: 150670922
Bug: 179790901
Bug: 179936318
Change-Id: I4c124ab5c4bcd9db50d35f41f8227a8bd2fb6744
2021-02-11 20:43:23 +00:00
Qi Wu
8e727f799b Add more tests for limited use key feature.
Verify that when keymint implementation supports rollback resistance,
it must also enforce the single use key in hardware by secure hardware.

Test: atest -c VtsAidlKeyMintTargetTest
Change-Id: Ib984003247906ded7266da620e2d82e826d916bc
2021-02-11 16:37:32 +00:00
David Zeuthen
37388b36bf Identity: Fix breakage caused by recent changes in libsoft_attestation_cert.
CL:1566356 changed the notBefore and notAfter fields in the X.509
attestation certificate returned by generate_attestation_from_EVP().
This broke the default implementation of the Identity Credential HAL.

Fixed by setting TAG_CERTIFICATE_NOT_BEFORE and
TAG_CERTIFICATE_NOT_AFTER to the expected values.

Test: atest VtsHalIdentityTargetTest
Bug: 179933300
Change-Id: I2dbca41c1e905c17cd2bc565d2e987945b86273a
2021-02-11 08:44:51 -05:00
Chirag Pathak
9ea6a0addc Vts tests for earlyBoot and deviceLocked functionality.
Test: atest VtsAidlKeyMintTargetTest
Bug: b/171287439.

Change-Id: I41c0b7b6b608b26147669b007225ad6f2d3cdfed
2021-02-10 23:42:44 +00:00
Treehugger Robot
709382fcc5 Merge "health 2.1 impl: log values properly." 2021-02-10 23:03:44 +00:00
Chirag Pathak
bcf07f93a7 The aidl changes related to device locked, entryBootEnded and hw info.
Test: atest VtsAidlKeyMintTargetTest
Bug: b/178222844, 179062062

Change-Id: Id4ffd6dae48ba45019d42303413ddbc35eb59935
2021-02-10 22:06:45 +00:00
Treehugger Robot
1d926594bd Merge "Remove stale TODOs about audio HALs" 2021-02-10 20:56:46 +00:00
Benjamin Schwartz
ff858d5636 power/stats: Clean up warnings
Bug: 179853694
Test: build
Change-Id: Ibb452160dff5d1ec81700a12a163c0f01d666338
2021-02-10 11:42:10 -08:00
Treehugger Robot
9dac2b95fc Merge "audio: Allow specifying "default" stream type in V7" 2021-02-10 19:40:08 +00:00
Chirag Pathak
8960aaefea The implementation of vts and default implementation to support ISecureClock and ISharedSecret AIDLs.
Test: atest VtsAidlSecureClockTargetTest, atest VtsAidlSharedSecretTargetTest
Bug: b/175136979, b/175141176

Change-Id: I4a0d25981d0172c0e2c8defc61b325eca6d6a029
2021-02-10 18:48:34 +00:00
Mikhail Naganov
7c95c4b535 Remove stale TODOs about audio HALs
Both 6.0 and 7.0 can be used for launching new
devices on S due to large amount of refactorings
in the interfaces. Vendors who don't need
the new features added in V7 are free to continue
using V6.

Bug: 142480271
Test: N/A
Change-Id: I133348b9a0a1a200ba28b2d67cac92f1962a3e09
2021-02-10 10:33:23 -08:00
Lev Proleev
9b2940dbce Merge changes from topic "nnapi_aidl_interface"
* changes:
  Implement VTS tests for NNAPI AIDL interface
  Add utils for AIDL types conversions
  Create first version of NNAPI AIDL interface
  Add dynamic interface casting to NN utility code
2021-02-10 16:45:19 +00:00
Thiébaud Weksteen
e9fb347e0b Merge "Document emergency case for setAllowedNetworkTypeBitmap" 2021-02-10 07:31:47 +00:00
Mikhail Naganov
5fd0c77caf audio: Allow specifying "default" stream type in V7
Despite that AUDIO_STREAM_DEFAULT value of audio_stream_type_t
should only used by the framework, it can still end up being
passed to the HAL in port configs and offload info structures.
This happens in the cases when the stream type is not actually
used by the HAL. It seems natural to use an empty string
as the value of AudioStreamType field in this case.

Bug: 179743630
Test: atest android.hardware.audio.common@7.0-util_tests
Test: make a telephone call on a device with HAL V7
Change-Id: Ia330031fca9d081627746b4f6074162835c4c54b
2021-02-09 20:41:52 -08:00
Treehugger Robot
7e734892c9 Merge "OMX VTS: free graphics buffers at the end of test" 2021-02-10 01:22:45 +00:00
Janis Danisevskis
164bb878d4 Fix Keymint VTS test after adding CERTIFICATE_* tags
Pass required tags to generateKey and importKey.

Bug: 179809936
Test: VtsAidlKeyMintTargetTest
Change-Id: I762f73de50ca35c2f1ed271385d863910f53dcd2
2021-02-09 13:55:26 -08:00
Treehugger Robot
a47bf3b8ad Merge changes from topic "ps 2.0 cp"
* changes:
  Add power.stats to compatibility matrix
  power/stats: Rename readEnergyMeters to readEnergyMeter
  power/stats: Add VTS tests for power stats hal
  Specify version for aidl_interface explicitly
  power/stats: Adding subsystem field to Channel
  power/stats: Add EnergyConsumer types
  power/stats: Add EnergyConsumerAttribution interface
  power/stats: Add duration field to EnergyMeasurement
  power/stats: Rename PowerStats HAL
  power/stats: Move PowerStats HAL 2.0 to power/stats
2021-02-09 19:20:10 +00:00
Thiébaud Weksteen
2ee3e2e814 Document emergency case for setAllowedNetworkTypeBitmap
Test: None
Bug: 163168917
Change-Id: Icb64d2732447ca5a22cd70fbb989f30fe1ed8050
2021-02-09 18:27:45 +00:00
Lev Proleev
c185e88ccf Implement VTS tests for NNAPI AIDL interface
The tests are copied from HIDL 1.0-3 VTS tests and updated to use AIDL.

Bug: 172922059
Test: VtsHalNeuralnetworksTargetTest
Change-Id: Ife08409e9b46420685a1ccb0b3256286c973dbf5
Merged-In: Ife08409e9b46420685a1ccb0b3256286c973dbf5
(cherry picked from commit b38bb4f12a)
2021-02-09 15:28:25 +00:00
Lev Proleev
6b6dfcd439 Add utils for AIDL types conversions
Add conversions between canonical types and NNAPI AIDL interface types
that are needed for AIDL sample driver implementation.

Bug: 172922059
Test: VtsNeuralnetworksTargetTest
Change-Id: I02803302e02457e52c752114b47b94239eff20e9
Merged-In: I02803302e02457e52c752114b47b94239eff20e9
(cherry picked from commit 532136b9d4)
2021-02-09 15:28:23 +00:00
Lev Proleev
bfd12c66e4 Create first version of NNAPI AIDL interface
Bug: 161428342
Test: m android.hardware.neuralnetworks-update-api && m
Change-Id: Icf8123746def6f4c654dc3e413e5169ab020c8b4
Merged-In: Icf8123746def6f4c654dc3e413e5169ab020c8b4
(cherry picked from commit 8090245174)
2021-02-09 15:28:19 +00:00
Michael Butler
e5e67024c6 Add dynamic interface casting to NN utility code
Prior to this CL, the NN utility code would always use the type of
IPreparedModel provided by IPreparedModeCallback::notify*. This means
that an IPreparedModel returned as a dynamic type of V1_X but static
type of V1_Y would be used by the utility code as V1_Y. This CL adds
dynamic casting, such that an IPreparedModel returned as a dynamic type
of V1_X but static type V1_Y will be dynamically cast to V1_X and used
as a V1_X::IPreparedModel.

This CL also adds the utility functions
V1_[0123]::convertFromNonCanonical to convert from a non-canonical type
to another non-canonical type by using canonical types as an
intermediate conversion "hop."

Bug: 178180472
Test: mma
Change-Id: I709b2a8944af2cc78b089aade55df1e2ab7b40cc
Merged-In: I709b2a8944af2cc78b089aade55df1e2ab7b40cc
(cherry picked from commit 49b5e4ebea)
2021-02-09 15:28:15 +00:00
Treehugger Robot
b755e019fd Merge "audio: Fix SourceMetadata spec in HAL V7 VTS" 2021-02-09 08:02:29 +00:00
Yifan Hong
633661ca8b health 2.1 impl: log values properly.
getHealthInfo_2_1 calls UpdateHealthInfo, where a subclass may
update health_info without updating the data in BatteryMonitor.
Hence, calling battery_monitor_.logValues() isn't accurate.

Log values properly by logging the updated health_info struct.

Test: healthd kernel logs have correct data
Fixes: 179326883
Change-Id: Ifab863746793abf3e3f1d5a458f05f4d9889bdfc
2021-02-08 15:22:09 -08:00
Shuo Qian
0c5fec28d2 Merge "Add emergencyDial_1_6 in the HAL to modify the multisim logic for pin lock" 2021-02-08 23:00:41 +00:00
Mikhail Naganov
44fa2dd00a audio: Fix SourceMetadata spec in HAL V7 VTS
This was missed in aosp/1576846.

Bug: 142480271
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: I96952b7e17b4098f16c3dc889e36d316a6673213
2021-02-08 13:49:50 -08:00
Jakub Pawlowski
ce1e0c72bd Merge "One libbluetooth_audio_session" 2021-02-08 21:23:14 +00:00
Jakub Pawlowski
f83049be6b Merge "Move libbluetooth_audio_session out of v2.0 folder" 2021-02-08 20:38:07 +00:00
Mikhail Naganov
f45a71d1c1 Merge "Add IEC60958 audio format" 2021-02-08 16:59:13 +00:00
Janis Danisevskis
2679ad6f24 Merge "Keymint: Add CERTIFICATE_* tags required for certificate generation." 2021-02-08 16:52:16 +00:00
Treehugger Robot
6a1a60e220 Merge changes I8ae16870,Ic0eb09df
* changes:
  audio: Allow using vendor extensions in surround formats (V6)
  audio: Allow using vendor extensions in surround formats (V5)
2021-02-08 08:32:21 +00:00
Jakub Pawlowski
3c8dc61462 One libbluetooth_audio_session
libbluetooth_audio_session must be version agnostic, and support both
2.0 and 2.1 bluetooth.audio vendor libraries

Test: compilation
Bug: 150670922
Change-Id: I6a4a10b37201da9a5fb289262530f9d9cd5041ac
2021-02-06 18:33:09 +01:00