David Zeuthen
482268110b
Merge "Add libhardware support for RSA OAEP MGF1." am: 1de976f07b
am: ee427986d8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1533863
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9553d2f4e2749b8f3acea9c71295bf9a34c5ebed
2021-01-05 17:23:50 +00:00
David Zeuthen
ee427986d8
Merge "Add libhardware support for RSA OAEP MGF1." am: 1de976f07b
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1533863
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I03baee6348ebf1964c42e4a4eef4647d8cd26a5d
2021-01-05 16:51:41 +00:00
David Zeuthen
1de976f07b
Merge "Add libhardware support for RSA OAEP MGF1."
2021-01-05 16:31:02 +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
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
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
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
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
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
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
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
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
Treehugger Robot
11e52152dd
[automerger skipped] Merge "Merge redfin/bramble support." am: 52e9473f1e
-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: I8277f169a1a084b98aee309daec057b2b5862484
2020-10-20 19:03:49 +00:00
Treehugger Robot
52e9473f1e
Merge "Merge redfin/bramble support."
2020-10-19 23:20:09 +00:00
Xin Li
2c9a8c3b66
Merge redfin/bramble support.
...
Bug: 171218636
Merged-In: Icce4e4f44a811726f76a8602a44e9060cc1dbaa1
Change-Id: I0a1a06f871172953b18c2fcdd6aedf19ed7b1460
2020-10-19 10:08:21 -07:00
Xin Li
8a3e98d302
[automerger skipped] Merge ab/6749736 in stage. am: 3109cbe663
-s ours am: eab682d153
-s ours
...
am skip reason: Change-Id I047a6d3c09be4f762a745319e2f37d5551abf9f1 with SHA-1 c59eaa7b18
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12804499
Change-Id: I3b771b9b9743ec9496e03bc065a0398e2cf7a144
2020-10-13 04:22:38 +00:00
Xin Li
eab682d153
[automerger skipped] Merge ab/6749736 in stage. am: 3109cbe663
-s ours
...
am skip reason: Change-Id I047a6d3c09be4f762a745319e2f37d5551abf9f1 with SHA-1 c59eaa7b18
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12804499
Change-Id: I902f417b7c08aefd32ce14596e3dcb74f403d6fa
2020-10-13 03:51:00 +00:00
Xin Li
3109cbe663
Merge ab/6749736 in stage.
...
Bug: 167233921
Merged-In: I047a6d3c09be4f762a745319e2f37d5551abf9f1
Change-Id: Icce4e4f44a811726f76a8602a44e9060cc1dbaa1
2020-10-08 22:58:30 -07:00
Xin Li
4702bf0671
[automerger skipped] Merge "Merge Android R" am: 02dfcc7c15
-s ours am: 5f3a19f76a
-s ours am: 51eba9d0f1
-s ours am: c1e843d407
-s ours
...
am skip reason: Change-Id Ib50a9978c77eda7e20e27f2d63615599f0517b6d with SHA-1 fae361f24e
is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1422436
Change-Id: Ib97618f24a680ee8927935929bf5fea4904e1c95
2020-09-11 03:58:41 +00:00
Xin Li
c1e843d407
[automerger skipped] Merge "Merge Android R" am: 02dfcc7c15
-s ours am: 5f3a19f76a
-s ours am: 51eba9d0f1
-s ours
...
am skip reason: Change-Id Ib50a9978c77eda7e20e27f2d63615599f0517b6d with SHA-1 fae361f24e
is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1422436
Change-Id: I06fc514a2fe82c1826fefaab9b80ddf718339690
2020-09-11 03:33:10 +00:00
Xin Li
51eba9d0f1
[automerger skipped] Merge "Merge Android R" am: 02dfcc7c15
-s ours am: 5f3a19f76a
-s ours
...
am skip reason: Change-Id Ib50a9978c77eda7e20e27f2d63615599f0517b6d with SHA-1 fae361f24e
is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1422436
Change-Id: Ie11c65689005146632761708cfa20033aaa32b20
2020-09-11 02:02:20 +00:00
Xin Li
5f3a19f76a
[automerger skipped] Merge "Merge Android R" am: 02dfcc7c15
-s ours
...
am skip reason: Change-Id Ib50a9978c77eda7e20e27f2d63615599f0517b6d with SHA-1 fae361f24e
is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1422436
Change-Id: I1dfdc73c439333e21b5a057c255f40f58361c6ef
2020-09-11 00:39:36 +00:00
Xin Li
02dfcc7c15
Merge "Merge Android R"
2020-09-10 17:22:03 +00:00
Xin Li
1d4cade478
Merge Android R
...
Bug: 168057903
Merged-In: Ib50a9978c77eda7e20e27f2d63615599f0517b6d
Change-Id: I7cefed0e9b2048b48227da4a2043658ef231a56e
2020-09-08 16:55:29 -07:00
Xin Li
77d46c26dd
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: fae361f24e
-s ours am: bebd516578
-s ours am: dd4825f900
-s ours
...
am skip reason: Change-Id I500b53e89f132b3925e6a1912c75b7834ea47ff4 with SHA-1 0d57727f5a
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12470210
Change-Id: I7e196cf74e2566fb120d7fe949de512db583feb2
2020-09-01 22:09:39 +00:00
Xin Li
dd4825f900
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: fae361f24e
-s ours am: bebd516578
-s ours
...
am skip reason: Change-Id I500b53e89f132b3925e6a1912c75b7834ea47ff4 with SHA-1 0d57727f5a
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12470210
Change-Id: I57fc999bbd30f806d73339da274f73dac471cd85
2020-09-01 21:46:23 +00:00
Xin Li
bebd516578
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: fae361f24e
-s ours
...
am skip reason: Change-Id I500b53e89f132b3925e6a1912c75b7834ea47ff4 with SHA-1 0d57727f5a
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12470210
Change-Id: Ie456f76702a06d46e628202a79b4c70dc19c75ae
2020-09-01 20:36:48 +00:00
Xin Li
fae361f24e
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
...
Bug: 166295507
Merged-In: I500b53e89f132b3925e6a1912c75b7834ea47ff4
Change-Id: Ib50a9978c77eda7e20e27f2d63615599f0517b6d
2020-08-27 10:16:42 -07:00