Commit graph

27672 commits

Author SHA1 Message Date
Benjamin Schwartz
54ef8247d8 power/stats: Rename PowerStats HAL am: 18a3fb5ce3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1576527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61f1ad5baeb72cb71473f8a0c51be738e1994bd9
2021-02-09 22:21:38 +00:00
Benjamin Schwartz
b2c06690bc power/stats: Move PowerStats HAL 2.0 to power/stats am: 817521bbb4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1576526

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a61480416acb78a2cb29abffabce62891f0220c
2021-02-09 22:20:57 +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
a5182d5684 Merge "audio: Fix SourceMetadata spec in HAL V7 VTS" am: b755e019fd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1580885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff5217ec01041733592a2f72acfe013b90be8e37
2021-02-09 08:31:52 +00:00
Treehugger Robot
b755e019fd Merge "audio: Fix SourceMetadata spec in HAL V7 VTS" 2021-02-09 08:02:29 +00:00
Shuo Qian
78d2245b33 Merge "Add emergencyDial_1_6 in the HAL to modify the multisim logic for pin lock" am: 0c5fec28d2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1568866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id099b0cbc19a1be0c1084059bfdc7aca3d895c4e
2021-02-08 23:31:11 +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
bf10e12b47 Merge "One libbluetooth_audio_session" am: ce1e0c72bd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1570661

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2de5d72f7b515c204c413b39ab0fe5ab153bbf82
2021-02-08 21:38:57 +00:00
Jakub Pawlowski
ce1e0c72bd Merge "One libbluetooth_audio_session" 2021-02-08 21:23:14 +00:00
Jakub Pawlowski
b15b409fdf Merge "Move libbluetooth_audio_session out of v2.0 folder" am: f83049be6b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1570284

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie651716169cb9fea0b4ef06863ffac5aaaa781f3
2021-02-08 21:06:12 +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
c8a3a1ad41 Merge "Add IEC60958 audio format" am: f45a71d1c1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1567260

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie07ca0065839c600735f3ae3df97c7e3e708e786
2021-02-08 17:48:39 +00:00
Janis Danisevskis
51c3645c51 Merge "Keymint: Add CERTIFICATE_* tags required for certificate generation." am: 2679ad6f24
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1566353

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic15a201136b74a8ee9d74f31afe5e70620c92373
2021-02-08 17:26:53 +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
c519d81ac3 Merge changes I8ae16870,Ic0eb09df am: 6a1a60e220
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1576536

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7c9ac50673cedf4c59f7251d38bbe4259d69cfc
2021-02-08 09:18:39 +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
23629b2fdc Merge "ISap has version 1.2." am: 4a0dcd9722
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1569324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a0ec459d2562138abe3bce4dd81d021de01e9bc
2021-02-06 01:58:43 +00:00
Treehugger Robot
4a0dcd9722 Merge "ISap has version 1.2." 2021-02-06 01:54:48 +00:00
Ady Abraham
73212deb28 Merge "Remove stoza@ from OWNERS" am: 04f36f9465
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1576523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4b4fc82cc508c2d96df0d767de1385a41d93c71
2021-02-06 01:34:39 +00:00
Ady Abraham
04f36f9465 Merge "Remove stoza@ from OWNERS" 2021-02-06 00:49:16 +00:00
Treehugger Robot
c57b216a49 Merge changes from topic "fix-b-142480271-xml-deserializer" am: a3b2ea24c4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1576846

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie787041c731f9f3f29959bab71f8478952b6298b
2021-02-05 23:04:35 +00:00
Mikhail Naganov
7707947ae7 Default Audio HAL service: add V7, remove V2 am: b4443504f1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1576845

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83c1625932c40501270b8124bc2a774c2c64d8a4
2021-02-05 23:04:31 +00:00
Mikhail Naganov
2f111c17d5 audio: Update audioPolicyConfiguration version am: 8a52581b09
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1576844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I454bf0d8f50e690a1d2b288399226b7d38fa7f91
2021-02-05 23:03:56 +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
Daniel Bright
d2288bd544 Specify which features the reduced feature set affects
Bug: 179513855
Test: N/A
Change-Id: I6026cdd54dbea13ffa1dd3ec400a72cf39cca4cb
2021-02-05 13:43:59 -08:00
Zoey Chen
c1f27e9269 Add dtmSupported into 1.6 HAL for 2G network am: fb3fa529b2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1574925

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89df521daad0b4158a192d115dbd8e2382d775b3
2021-02-05 16:59:47 +00:00
Ayushi Khopkar
b3057b00c9 Added vehicleManager_fuzzer
Test: ./vehicleManager_fuzzer
Bug: 172427588

Change-Id: Ib0e34c3fb62d80fd837be7c801d60a58e2d6f9c6
2021-02-05 15:02:47 +05:30
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
9af4be5581 Merge "Camera: Set arbitrary dataspace for RAW streams" am: 371265231c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1576524

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55fc51967ff4d5af17ae740b7ebeed5d0c8bdf4a
2021-02-05 00:25:25 +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
Treehugger Robot
a45166f8e2 Merge "FCM exclude: update comment for deprecated health 1.0 HAL" am: 9db73647a3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1566742

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If69094e057ffb93f5f08c15f1d78bb699996ae5e
2021-02-04 23:42:19 +00: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