Commit graph

5608 commits

Author SHA1 Message Date
David Zeuthen
1de976f07b Merge "Add libhardware support for RSA OAEP MGF1." 2021-01-05 16:31:02 +00:00
Eric Laurent
43ddb2895d Merge "audio HAL: new track metadata version" 2021-01-04 15:57:09 +00:00
Chirag Pathak
39fd306e43 Add libhardware support for RSA OAEP MGF1.
Test: atest VtsAidlKeyMintV1_0TargetTest
Bug: 160968519
Change-Id: I2c534d2a9ad401a48451ca392ebf6e0039345de4
2020-12-21 18:45:35 -05:00
TreeHugger Robot
3b66351f2c Merge "Upgrade device version of usb audio HAL to 3.0." 2020-12-21 21:56:01 +00:00
jiabin
400bbe0e7d Upgrade device version of usb audio HAL to 3.0.
Upgrade device version of usb audio HAL to 3.0. With this change, the
framework will use createAudioPatch API for audio routing.

When opening a stream, the HAL will open alsa device with the given
device information. The HAL will cache the io handle to identify the
stream. Before starting audio playback/recording, create_audio_patch
API is called to set the correct devices. All the devices will be
cached as a list in stream_in/stream_out. The HAL will return a unique
patch handle which is used when updating/releasing the patch. When
patch is released, the patch handle will also be removed.

Bug: 160352965
Test: playback/record with usb device
Change-Id: Iba69c5cc82d1063af8ab050183d6a57b27083ee1
2020-12-17 13:09:38 -08:00
Eric Laurent
2e8b8a906d audio HAL: new track metadata version
Add channel mask and audio attributes tags to playback
and record track metadata sent to audio HAL.
Add new HAL methods and structs for use with HALs version 3.2
and above to provide backwards compatibility with old HALs.

Bug: 168751366
Test: make
Change-Id: I30cc3d35f97bb1bc5f80983f6ae85f3e820bf414
2020-12-16 16:09:19 +01:00
Tianjie Xu
de3cf61a43 Merge "Add a function pointer to get active boot slot" am: c4b24df2ef am: 8281ca965f am: afd797f823
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1514949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ee3f1b00302b9f7719bdbefa3700356cc8168ae
2020-12-11 23:21:48 +00:00
Tianjie Xu
afd797f823 Merge "Add a function pointer to get active boot slot" am: c4b24df2ef am: 8281ca965f
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1514949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b99e5e590504bda7f681ae6cdd7557f74402378
2020-12-11 23:02:11 +00:00
Tianjie Xu
8281ca965f Merge "Add a function pointer to get active boot slot" am: c4b24df2ef
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1514949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie39cf55d1752b1c60746d986395db769eb8d9d06
2020-12-11 22:41:54 +00:00
Tianjie Xu
c4b24df2ef Merge "Add a function pointer to get active boot slot" 2020-12-11 21:57:24 +00:00
Treehugger Robot
ed9b1d6dc0 [automerger skipped] Merge "Add a new API for getting audio_port_v7." am: d12f224486 am: e8860846c6 am: 2f7c222e5e -s ours
am skip reason: Change-Id I60f2615791c19aed37fdb91328e8bc420bc3419d with SHA-1 d651051c81 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1518624

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I930b0fbbcf8a8c82160b0a4acbb6ec3bdb8aed5d
2020-12-09 12:08:30 +00:00
Treehugger Robot
2f7c222e5e Merge "Add a new API for getting audio_port_v7." am: d12f224486 am: e8860846c6
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1518624

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ebd3ca635263b9d7882ae17cca10526a598ff1f
2020-12-09 11:25:16 +00:00
Treehugger Robot
e8860846c6 Merge "Add a new API for getting audio_port_v7." am: d12f224486
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1518624

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f15574d6be358ba5b6e2eb12f6f33a1aab90770
2020-12-09 10:40:37 +00:00
Treehugger Robot
d12f224486 Merge "Add a new API for getting audio_port_v7." 2020-12-09 10:05:53 +00:00
jiabin
31d6646e63 Add a new API for getting audio_port_v7.
Add a function to audio HAL interface for retrieving audio_port_v7
structure directly. The legacy audio_port structure can always be
converted into audio_port_v7, however the latter may contain more
information.

This function must be supported from legacy HAL version 3.2.

Bug: 160352965
Test: make
Change-Id: I60f2615791c19aed37fdb91328e8bc420bc3419d
Merged-In: I60f2615791c19aed37fdb91328e8bc420bc3419d
2020-12-09 01:57:58 +00:00
Tianjie
a40c2001fa Add a function pointer to get active boot slot
bootcontrol 1.2 adds a new function to get the active boot slot
on the next boot. Since the getter is closely related to the gpt
implementation of bootcontrol, we add the header here and expose
to clients of libhardware. Devices with an old HAL should never
call this new getter function.

Bug: 173808057
Test: Vts tests for bootcontrol

Change-Id: I19135ed16bf0ba546e0a8d9cb2d521ec0a9c5bbc
2020-12-08 14:29:11 -08:00
TreeHugger Robot
dd4f52a5bd Merge "Use list to cache alsa_device_profile/proxy for usb playback/capture." 2020-12-08 19:10:37 +00:00
Treehugger Robot
0be5c43e17 Merge "Delete keymaster0" am: d87b1d1ace am: a3849fec82 am: da306dc2f7
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1515114

Change-Id: I14e9fc012de7b1b7a51795e7199289e1d17273a6
2020-12-07 20:55:17 +00:00
jiabin
8b265c90b2 Use list to cache alsa_device_profile/proxy for usb playback/capture.
This is part of supporting multiple devices playback. Currently, the usb
audio module only supports single device. The limitation is that there
is only one alsa_device_profile/proxy cached. With supporting multiple
devices playback in audio framework, it makes sense to use list to cache
alsa_device_profile/proxy so that it is possible to route audio to
multiple USB devices simultaneously.

To keep the code symemetric, the device for capture is also cached as a
list. But there will only be one device for capture.

Test: play audio via USB
Bug: 160352965
Change-Id: Ibe7bbb7000d657381b317c19fda57e6c0edaa1df
2020-12-07 07:06:24 -08:00
Treehugger Robot
da306dc2f7 Merge "Delete keymaster0" am: d87b1d1ace am: a3849fec82
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1515114

Change-Id: I3be37dacb4c1970538b18768a074ddcde38e468c
2020-12-07 03:29:37 +00:00
Treehugger Robot
a3849fec82 Merge "Delete keymaster0" am: d87b1d1ace
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1515114

Change-Id: I76fbc563b095c7305c46a96413f7d24956f22d27
2020-12-07 03:22:48 +00:00
Treehugger Robot
d87b1d1ace Merge "Delete keymaster0" 2020-12-07 02:47:29 +00:00
Shawn Willden
937d61c8c4 Delete keymaster0
Test: Build
Change-Id: I55f713587ccd91a9ec76cc10f84ecb0109aad7ac
2020-12-04 11:52:34 -07:00
Treehugger Robot
84bcd78ece [automerger skipped] Merge "Convert mask types from uint32_t to enum type" am: 30a37a7a4b am: 1478481533 am: 38eedb9d19 -s ours
am skip reason: Change-Id I8f1e6fa2bbad8900fdae66f01ac70c75953fd62c with SHA-1 27aa8b3a53 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1510315

Change-Id: I5d80b9ecd76fbcdaf9c82904c668b988e7a0f640
2020-12-01 18:27:58 +00:00
Treehugger Robot
38eedb9d19 Merge "Convert mask types from uint32_t to enum type" am: 30a37a7a4b am: 1478481533
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1510315

Change-Id: I2508231eb6b38f921d5271d039f5fd35d71b020e
2020-12-01 18:08:52 +00:00
Treehugger Robot
1478481533 Merge "Convert mask types from uint32_t to enum type" am: 30a37a7a4b
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1510315

Change-Id: I22c02105575c30900259ecfa360125ba5cacced5
2020-12-01 17:42:20 +00:00
Treehugger Robot
30a37a7a4b Merge "Convert mask types from uint32_t to enum type" 2020-12-01 17:06:51 +00:00
Xin Li
eb281f3f1f Mark ab/6881855 as merged am: 6e1b4e18f2 am: 3a526ad21a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/13112999

Change-Id: If068b7b0303feb1d0476745ab3abdd62ae2f6275
2020-11-25 03:19:39 +00:00
Xin Li
3a526ad21a Mark ab/6881855 as merged am: 6e1b4e18f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/13112999

Change-Id: I053ee67b83e3d39b201419b9efa3fc95952da127
2020-11-25 03:07:53 +00:00
Mikhail Naganov
e72761731d Convert mask types from uint32_t to enum type
This applies to the following types:

- audio_gain_mode_t;
- audio_flags_mask_t;
- audio_channel_representation_t;
- audio_channel_mask_t;
- audio_devices_t.

Enum types are distinct thus proper overloading on the type
is possible in C++. Also, assignments to enum types are
less prone to errors.

Bug: 169889714
Test: basic audio functionality
Change-Id: I8f1e6fa2bbad8900fdae66f01ac70c75953fd62c
Merged-In: I8f1e6fa2bbad8900fdae66f01ac70c75953fd62c
2020-11-24 03:43:26 +00:00
Xin Li
6e1b4e18f2 Mark ab/6881855 as merged
Bug: 172690556
Change-Id: I4fa0e8f07fc295560736c763647ac18d4d7f96a0
2020-11-23 11:31:19 -08:00
Treehugger Robot
36471163df Merge "Add new certificate tags defination for KeyMint V1." am: 78b8a3ffed am: 210e6bb504 am: e79b241ac6 am: fac68811bb
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1412868

Change-Id: Id8277401ba23900dcaffd5d82b7206e3c400b51f
2020-11-19 15:13:09 +00:00
Treehugger Robot
fac68811bb Merge "Add new certificate tags defination for KeyMint V1." am: 78b8a3ffed am: 210e6bb504 am: e79b241ac6
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1412868

Change-Id: I0c46efdf08c32f0eff86506028a9887a563df853
2020-11-19 15:01:49 +00:00
Treehugger Robot
e79b241ac6 Merge "Add new certificate tags defination for KeyMint V1." am: 78b8a3ffed am: 210e6bb504
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1412868

Change-Id: Ib1283765f0fe673e65dab750ad37155b5df73a40
2020-11-19 14:26:56 +00:00
Treehugger Robot
210e6bb504 Merge "Add new certificate tags defination for KeyMint V1." am: 78b8a3ffed
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1412868

Change-Id: Ie2376377dd012f13db47ac44d6a6a69b027a2550
2020-11-19 13:56:05 +00:00
Treehugger Robot
78b8a3ffed Merge "Add new certificate tags defination for KeyMint V1." 2020-11-19 13:43:50 +00:00
Selene Huang
d7dcd78f01 Add new certificate tags defination for KeyMint V1.
Test: n/a
Change-Id: I05f629feec5cd2bd01f03b88cd5d830bb1f22623
2020-11-18 18:14:50 -08:00
Treehugger Robot
5fa6463efb [automerger skipped] Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." am: b1b3cd4669 am: 11e5a32f9f am: 1fb44edc64 am: 6a7fa9b3e1 -s ours
am skip reason: Change-Id Ie01cbc50d9bc77150adc46962d06cda2a7c1544a with SHA-1 a7de85db82 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1480396

Change-Id: Id5cd669a99c877ede59f60a8f9ce170a5efbf2d9
2020-11-03 16:58:25 +00:00
Treehugger Robot
6a7fa9b3e1 Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." am: b1b3cd4669 am: 11e5a32f9f am: 1fb44edc64
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1480396

Change-Id: I2802c6df6689f9fa2a0107fcdd1e0047616532ba
2020-11-03 16:46:47 +00:00
Treehugger Robot
1fb44edc64 Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." am: b1b3cd4669 am: 11e5a32f9f
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1480396

Change-Id: I3f95ab4f1218e592bba00c50ccd52415a66f9941
2020-11-03 16:30:30 +00:00
Treehugger Robot
11e5a32f9f Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." am: b1b3cd4669
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1480396

Change-Id: I107d380ed11bd50a04cc75e799fd2b45e589aadd
2020-11-03 16:11:27 +00:00
Treehugger Robot
b1b3cd4669 Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." 2020-11-03 15:35:09 +00:00
Selene Huang
5d3c1ec971 keymaster_defs: Add missing tags added in KM 4.1 and earlier.
Test: N/A
Change-Id: Ie01cbc50d9bc77150adc46962d06cda2a7c1544a
Merged-In: Ie01cbc50d9bc77150adc46962d06cda2a7c1544a
2020-11-03 03:23:13 +00:00
TreeHugger Robot
a44d144119 Merge "Add a new API for getting audio_port_v7." 2020-11-02 20:48:41 +00:00
jiabin
d651051c81 Add a new API for getting audio_port_v7.
Add a function to audio HAL interface for retrieving audio_port_v7
structure directly. The legacy audio_port structure can always be
converted into audio_port_v7, however the latter may contain more
information.

This function must be supported from legacy HAL version 3.2.

Bug: 160352965
Test: make
Change-Id: I60f2615791c19aed37fdb91328e8bc420bc3419d
2020-10-30 14:09:57 -07:00
TreeHugger Robot
d9e5e303c6 Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." 2020-10-30 14:38:58 +00:00
Selene Huang
a7de85db82 keymaster_defs: Add missing tags added in KM 4.1 and earlier.
Test: N/A
Change-Id: Ie01cbc50d9bc77150adc46962d06cda2a7c1544a
2020-10-29 12:13:23 -07:00
Treehugger Robot
1483ad3039 [automerger skipped] Merge "Merge redfin/bramble support." am: 52e9473f1e -s ours am: 11e52152dd -s ours am: 9dddd731ac -s ours am: 07be880068 -s ours
am skip reason: Change-Id Icce4e4f44a811726f76a8602a44e9060cc1dbaa1 with SHA-1 3109cbe663 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1465935

Change-Id: I78c7401049f8d51f5db53cf20780da97517573b4
2020-10-20 21:08:02 +00:00
Treehugger Robot
07be880068 [automerger skipped] Merge "Merge redfin/bramble support." am: 52e9473f1e -s ours am: 11e52152dd -s ours am: 9dddd731ac -s ours
am skip reason: Change-Id Icce4e4f44a811726f76a8602a44e9060cc1dbaa1 with SHA-1 3109cbe663 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1465935

Change-Id: I72248cd3b1bfa04c4c11ffdf50296f9ce8e38adc
2020-10-20 20:18:21 +00:00
Treehugger Robot
9dddd731ac [automerger skipped] Merge "Merge redfin/bramble support." am: 52e9473f1e -s ours am: 11e52152dd -s ours
am skip reason: Change-Id Icce4e4f44a811726f76a8602a44e9060cc1dbaa1 with SHA-1 3109cbe663 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1465935

Change-Id: I281dc4a0826e6e99fed072a8ec3e86e2a2db32ba
2020-10-20 19:34:02 +00:00