Commit graph

27115 commits

Author SHA1 Message Date
Daniel Bright
2e139d2201 Added javadoc to apn retry \ throttling related methods
Bug: 175092152
Test: N/A
Merged-In: I84c7845343a08d725764cf4a5777f720b8f6d0da
Change-Id: I84c7845343a08d725764cf4a5777f720b8f6d0da
2021-02-21 15:01:52 -08: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
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
Treehugger Robot
709382fcc5 Merge "health 2.1 impl: log values properly." 2021-02-10 23:03:44 +00:00
Treehugger Robot
1d926594bd Merge "Remove stale TODOs about audio HALs" 2021-02-10 20:56:46 +00: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
Jakub Pawlowski
964f323023 Move libbluetooth_audio_session out of v2.0 folder
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: I487022b28a471960e669b9794808dd53b1bdca17
2021-02-06 18:33:09 +01:00
Treehugger Robot
4a0dcd9722 Merge "ISap has version 1.2." 2021-02-06 01:54:48 +00:00
Ady Abraham
04f36f9465 Merge "Remove stoza@ from OWNERS" 2021-02-06 00:49:16 +00:00
Treehugger Robot
a3b2ea24c4 Merge changes from topic "fix-b-142480271-xml-deserializer"
* changes:
  audio: Fix SourceMetadata spec in HAL V7 VTS
  Default Audio HAL service: add V7, remove V2
  audio: Update audioPolicyConfiguration version
2021-02-05 22:17:08 +00:00
Dean Wheatley
4a645c3f97 Add IEC60958 audio format
This format refers to the IEC 60958 specification. It can be used when
patching HDMI inputs. IEC 60958 can transport PCM and compressed audio.

Test: m
Change-Id: Idfafb3e2dc73ffb26529d797dce86f8419e5f75d
2021-02-05 22:13:30 +00:00
Benjamin Schwartz
020ab65095 Add power.stats to compatibility matrix
Bug: 169864180
Test: m
Change-Id: I67d6d1496b663e41ac519621ef71ba957db0154c
Merged-In: I6abacd82d9bcbc5957dcad891ae5c742bc307316
2021-02-04 20:58:27 -08:00
Zoey Chen
fb3fa529b2 Add dtmSupported into 1.6 HAL for 2G network
Bug: 178328574
Test: make, VTS
Change-Id: Iba230acda8302df90e77d93701d9b0ba74196fc0
Merged-In: Iba230acda8302df90e77d93701d9b0ba74196fc0
2021-02-05 11:46:02 +08:00
Mikhail Naganov
c32b8584e9 audio: Fix SourceMetadata spec in HAL V7 VTS
Bug: 142480271
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: Idb1130c9b0d32a41f22c49fa1d14ffe8ec2a3f3c
2021-02-05 02:03:19 +00:00
Mikhail Naganov
b4443504f1 Default Audio HAL service: add V7, remove V2
Modify the list of supported audio HAL versions in
android.hardware.audio.service: add V7, remove V2.

Bug: 171260360
Test: m
Change-Id: I7ecdac0b9a30e51e2b1b54d7a56dfc9d62649fb4
2021-02-05 02:01:56 +00:00
Mikhail Naganov
8a52581b09 audio: Update audioPolicyConfiguration version
HAL V7 uses spaces instead of ',' and '|' for delimiting
elements in channel masks, sample rates, and flags lists
in the Audio Policy Manager configuration XML.
The version specified in the APM XML has been updated
from '1.0' to '7.0' in order to reflect this.

The migration script has been updated to change the
version in the XML on update.

Bug: 142480271
Test: m
Change-Id: I92c206dddee6964fc2019fed80435cb8d69dbfe9
2021-02-05 02:01:43 +00:00
Treehugger Robot
371265231c Merge "Camera: Set arbitrary dataspace for RAW streams" 2021-02-05 00:07:57 +00:00
Mikhail Naganov
14fa6ee5b1 audio: Allow using vendor extensions in surround formats (V6)
The 'surroundFormats' section must allow specifying
vendor-provided formats (vendor extensions). This has been
fixed in Audio HAL V7. Backporting to earlier versions.

Bug: 173647783
Test: atest VtsHalAudioV6_0TargetTest
Change-Id: I8ae1687087bab3f1c9020f351bdf7b81b9e74e50
2021-02-04 16:04:56 -08:00
Mikhail Naganov
8844e5b92d audio: Allow using vendor extensions in surround formats (V5)
The 'surroundFormats' section must allow specifying
vendor-provided formats (vendor extensions). This has been
fixed in Audio HAL V7. Backporting to earlier versions.

Bug: 173647783
Test: atest VtsHalAudioV5_0TargetTest
Change-Id: Ic0eb09df927af243d56038a8a102f0607bbaafaf
2021-02-04 16:04:56 -08:00
Benjamin Schwartz
eef94f8f4f power/stats: Rename readEnergyMeters to readEnergyMeter
Bug: 135067502
Test: build
Change-Id: I76e73668faf248ca33a37eb221973d2164d9c9b8
Merged-In: I76e73668faf248ca33a37eb221973d2164d9c9b8
2021-02-04 15:29:00 -08:00
Benjamin Schwartz
c357e98dcc power/stats: Add VTS tests for power stats hal
Bug: 165345767
Test: atest VtsHalPowerStatsTargetTest
Change-Id: Iba90d106a5be13d817a4a2fb36098781ea2f9ee0
Merged-In: Iba90d106a5be13d817a4a2fb36098781ea2f9ee0
2021-02-04 15:28:48 -08:00
Jeongik Cha
94f7f43372 Specify version for aidl_interface explicitly
Bug: 150578172
Test: m
Change-Id: I141de8ed6958fe42f727a0fa41473de4c1fb38de
Merged-In: I141de8ed6958fe42f727a0fa41473de4c1fb38de
2021-02-04 15:28:36 -08:00
Benjamin Schwartz
e3dfa5b158 power/stats: Adding subsystem field to Channel
Also fixing some comments

Bug: 178115561
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I630d26ffe02e7d8a26f42f10516900370db3a3bb
Merged-In: I630d26ffe02e7d8a26f42f10516900370db3a3bb
2021-02-04 15:28:24 -08:00
Benjamin Schwartz
74e09c73e8 power/stats: Add EnergyConsumer types
Also cleaning up Power Stats HAL type names to be less verbose

Bug: 176117316
Test: atest VtsHalPowerStatsTargetTest
Change-Id: I252a13b0490326ab9557f4a81ee313e57eb36754
Merged-In: I252a13b0490326ab9557f4a81ee313e57eb36754
2021-02-04 15:28:13 -08:00
samou
192ee6b315 power/stats: Add EnergyConsumerAttribution interface
Bug: 172576334
Test: build pass
Change-Id: I4a02a3cb9a20bd371cf1c0bf0c891eecb0283fbe
Merged-In: I4a02a3cb9a20bd371cf1c0bf0c891eecb0283fbe
2021-02-04 15:28:01 -08:00