summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "add is_valid to oob data"HEADandroid-s-beta-5android-s-beta-4android-s-beta-3masterandroid-s-beta-5android-s-beta-4Treehugger Robot2021-06-281-0/+1
|\
| * add is_valid to oob dataMartin Brabham2021-06-181-0/+1
|/ | | | | | | Bug: 178007935 Test: manual, test app Tag: #feature Change-Id: I9ba3639904471a4c34d8f5df753c416e149749c7
* Merge "Use libgtest_prod_headers." am: 7749ef2a4aYifan Hong2021-04-281-3/+2
|\ | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1687225 Change-Id: I519b644d9185facea7a212063c61e287c809ef6a
| * Merge "Use libgtest_prod_headers."android-s-beta-2android-s-beta-1Yifan Hong2021-04-281-3/+2
| |\
| | * Use libgtest_prod_headers.Yifan Hong2021-04-261-3/+2
| | | | | | | | | | | | | | | | | | Test: builds Bug: 185916167 Change-Id: Ifdb71aa9e6e9eeadd4d7c9cb4850832650dd12e8
* | | Merge "r_submix: Implement get_capture_position" am: 6ca3fb08caTreehugger Robot2021-03-221-5/+40
|\| | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1642345 Change-Id: I51c3439b5427c593755f8b46be56a05abc70064a
| * | Merge "r_submix: Implement get_capture_position"Treehugger Robot2021-03-221-5/+40
| |\ \
| | * | r_submix: Implement get_capture_positionMikhail Naganov2021-03-171-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IStream.getCapturePosition becomes mandatory in audio HAL V7. The legacy implementation must provide it for the default HAL implementation. Bug: 161253754 Test: atest VtsHalAudioV7_0TargetTest Change-Id: I2f2094f0499ba85f53f291e0a269211981b4c9d8
* | | | Merge "Update oob data struct" am: f2c4a568ccTreehugger Robot2021-03-192-14/+21
|\| | | | |/ / |/| | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1636699 Change-Id: I3c401d8fed1fcaf012fcf6947e266e0650934614
| * | Merge "Update oob data struct"Treehugger Robot2021-03-192-14/+21
|/| |
| * | Update oob data structMartin Brabham2021-03-152-14/+21
|/ / | | | | | | | | | | | | | | Bug: 178007935 Test: compiles and runs Tag: #feature Change-Id: Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06 Merged-In: Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06
* | Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10Paul Crowley2021-02-271-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1581935 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I26af986c4429e48c6ec492c8bf32a34931e9e585
| * \ Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error"Paul Crowley2021-02-271-2/+3
| |\ \
| | * | Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED errorPaul Crowley2021-02-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Test: Treehugger Bug: 176450483 Change-Id: Ibfc838496fec507dbe4831e86b933666296a4b35
* | | | Mark ab/7061308 as merged in stage.Xin Li2021-02-200-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 180401296 Merged-In: I6b99e5e590504bda7f681ae6cdd7557f74402378 Change-Id: I95c93d049f84bb0b88d87533ade5f7cf715e074f
| * \ \ \ Merge "Add a function pointer to get active boot slot" am: c4b24df2ef am: ↵Tianjie Xu2020-12-111-1/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8281ca965f Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1514949 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6b99e5e590504bda7f681ae6cdd7557f74402378
| * \ \ \ \ Merge "Add a new API for getting audio_port_v7." am: d12f224486 am: e8860846c6Treehugger Robot2020-12-091-1/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1518624 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8ebd3ca635263b9d7882ae17cca10526a598ff1f
| * \ \ \ \ \ Merge "Delete keymaster0" am: d87b1d1ace am: a3849fec82Treehugger Robot2020-12-073-1409/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1515114 Change-Id: I3be37dacb4c1970538b18768a074ddcde38e468c
| * \ \ \ \ \ \ Merge "Convert mask types from uint32_t to enum type" am: 30a37a7a4b am: ↵Treehugger Robot2020-12-011-1/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1478481533 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1510315 Change-Id: I2508231eb6b38f921d5271d039f5fd35d71b020e
| * \ \ \ \ \ \ \ Mark ab/6881855 as merged am: 6e1b4e18f2Xin Li2020-11-250-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/13112999 Change-Id: I053ee67b83e3d39b201419b9efa3fc95952da127
| * \ \ \ \ \ \ \ \ Merge "Add new certificate tags defination for KeyMint V1." am: 78b8a3ffed ↵Treehugger Robot2020-11-191-0/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 210e6bb504 am: e79b241ac6 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1412868 Change-Id: I0c46efdf08c32f0eff86506028a9887a563df853
| | * \ \ \ \ \ \ \ \ Merge "Add new certificate tags defination for KeyMint V1." am: 78b8a3ffed ↵Treehugger Robot2020-11-191-0/+10
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 210e6bb504 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1412868 Change-Id: Ib1283765f0fe673e65dab750ad37155b5df73a40
| * | | | | | | | | | | Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." am: ↵Treehugger Robot2020-11-031-6/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1b3cd4669 am: 11e5a32f9f am: 1fb44edc64 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1480396 Change-Id: I2802c6df6689f9fa2a0107fcdd1e0047616532ba
| | * | | | | | | | | | Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." am: ↵Treehugger Robot2020-11-031-6/+16
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1b3cd4669 am: 11e5a32f9f Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1480396 Change-Id: I3f95ab4f1218e592bba00c50ccd52415a66f9941
| * | | | | | | | | | | | [automerger skipped] Merge "Merge redfin/bramble support." am: 52e9473f1e -s ↵Treehugger Robot2020-10-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | [automerger skipped] Merge "Merge redfin/bramble support." am: 52e9473f1e -s ↵Treehugger Robot2020-10-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | [automerger skipped] Merge ab/6749736 in stage. am: 3109cbe663 -s ours am: ↵Xin Li2020-10-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | [automerger skipped] Merge ab/6749736 in stage. am: 3109cbe663 -s oursXin Li2020-10-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | \ \ \ \ \ \ \ \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware" am: a3888bdcb9Bob Badour2021-02-1933-0/+303
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1588486 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ice476cfd865dc5b9ef4a03006800505aff83c4b0
| * | | | | | | | | | | | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware"Bob Badour2021-02-1833-0/+303
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardwareBob Badour2021-02-1233-0/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added SPDX-license-identifier-Apache-2.0 to: modules/audio/Android.bp modules/audio_remote_submix/Android.bp modules/audio_remote_submix/tests/Android.bp modules/camera/3_0/Android.bp modules/consumerir/Android.bp modules/fingerprint/Android.bp modules/gralloc/Android.mk modules/hwcomposer/Android.bp modules/input/evdev/Android.bp modules/local_time/Android.bp modules/nfc-nci/Android.bp modules/nfc/Android.bp modules/power/Android.bp modules/radio/Android.bp modules/sensors/Android.bp modules/sensors/Android.mk modules/sensors/dynamic_sensor/Android.bp modules/sensors/dynamic_sensor/HidUtils/Android.bp modules/soundtrigger/Android.bp modules/thermal/Android.bp modules/tv_input/Android.bp modules/usbaudio/Android.bp modules/usbcamera/Android.bp modules/vibrator/Android.bp modules/vr/Android.bp tests/camera3/Android.bp tests/fingerprint/Android.bp tests/hardware/Android.bp tests/hwc/Android.bp tests/input/evdev/Android.bp tests/nusensors/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: Android.bp modules/camera/3_4/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I28924363e6c478f5d0b465b63534c4efd041c770
* | | | | | | | | | | | | | | Merge "Add ATTEST_KEY" am: 41e68bfb11Shawn Willden2021-02-171-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1584435 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I909a2e2b5aad3d1bcce88f055a4569621a6c97df
| * | | | | | | | | | | | | | Merge "Add ATTEST_KEY"android-s-preview-1Shawn Willden2021-02-171-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add ATTEST_KEYShawn Willden2021-02-111-1/+3
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 171845787 Test: Build Change-Id: I41451eb35dd0992c049525782e7afb5228ed6b3f
* | | | | | | | | | | | | | Merge "Keymint: Add CERTIFICATE_* tags" am: ead6cd16d8Janis Danisevskis2021-02-081-1/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566355 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibb299a56e9021c33e0029473f091bb120450db15
| * | | | | | | | | | | | | Merge "Keymint: Add CERTIFICATE_* tags"Janis Danisevskis2021-02-081-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Keymint: Add CERTIFICATE_* tagsJanis Danisevskis2021-01-311-1/+15
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CERTIFICATE_NOT_BEFORE/AFTER and change CERTIFICATE_SERIAL to bignum type. Test: N/A Change-Id: I5b1ed20a9babe8425e98a03637cdc14be842872c
* | | | | | | | | | | | | | Merge "add audio.usbv2.default linking libtinyalsav2 and libalsautilsv2" am: ↵David Li2021-02-031-4/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd8ee49f8b Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566240 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I689db4fd3cc57044fea5b5d8bb988bb6ff5ce6ae
| * | | | | | | | | | | | | Merge "add audio.usbv2.default linking libtinyalsav2 and libalsautilsv2"David Li2021-02-031-4/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | add audio.usbv2.default linking libtinyalsav2 and libalsautilsv2David Li2021-02-011-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: mm audio.usb.default audio.usbv2.default Bug: 134958010 Change-Id: I2664a7461afaed6f71d58d730c7b8d5463240653
* | | | | | | | | | | | | | Merge "audio: add implementation for TV related API" am: 541a8d3e5bAndy Hung2021-01-281-0/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1562805 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1e1940b2690d789adb892cf465c80fbe79583031
| * | | | | | | | | | | | | Merge "audio: add implementation for TV related API"Andy Hung2021-01-281-0/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | audio: add implementation for TV related APIKuowei Li2021-01-271-0/+74
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. AudioDescriptionMixLevel getter/setter. 2. DualMonoMode getter/setter. 3. PlaybackRate getter/setter. Test: TIS player with instrumented HAL Test: atest AudioTrackTest#testTunerConfiguration Test: atest AudioTrackTest#testDualMonoMode Test: atest AudioTrackTest#testAudioDescriptionMixLevel Test: atest AudioManagerTest#testGetAdditionalOutputDeviceDelay Bug: 173482792 Merged-In: Id89dd151797723dbb58a44db48ff05bff3f20e04 Change-Id: Id89dd151797723dbb58a44db48ff05bff3f20e04
* | | | | | | | | | | | | | Merge "Add limited use key tag defination." am: 3cd53f9f9dTreehugger Robot2021-01-261-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1538759 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifc5e42d48094e0ba4e8f46218f4ee25456d072af
| * | | | | | | | | | | | | Merge "Add limited use key tag defination."Treehugger Robot2021-01-261-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add limited use key tag defination.Qi Wu2021-01-131-0/+2
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: none Change-Id: I5464f6411b8bce94a3736cd033d064e75d313fe1
* | | | | | | | | | | | | | Merge "Add KM_PURPOSE_AGREE_KEY constant." am: 203813672eDavid Zeuthen2021-01-261-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1556301 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I44156928417a3288a6b2fdcf21604b6bca8eeafd
| * | | | | | | | | | | | | Merge "Add KM_PURPOSE_AGREE_KEY constant."David Zeuthen2021-01-261-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Add KM_PURPOSE_AGREE_KEY constant.David Zeuthen2021-01-251-0/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: VtsAidlKeyMintTargetTest Bug: 171847641 Change-Id: I9e3128652767509911445491248c01953359cb67
* | | | | | | | | | | | | Merge "audio HAL: new track metadata version" am: 29ae34bcdeTreehugger Robot2021-01-071-0/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1540995 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I265c473032e6452baf7cc65a55352d8c0e005b5d