summaryrefslogtreecommitdiffstats
Commit message (Expand)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
|/
* Merge "Use libgtest_prod_headers." am: 7749ef2a4aYifan Hong2021-04-281-3/+2
|\
| * 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
* | | Merge "r_submix: Implement get_capture_position" am: 6ca3fb08caTreehugger Robot2021-03-221-5/+40
|\| |
| * | Merge "r_submix: Implement get_capture_position"Treehugger Robot2021-03-221-5/+40
| |\ \
| | * | r_submix: Implement get_capture_positionMikhail Naganov2021-03-171-5/+40
* | | | Merge "Update oob data struct" am: f2c4a568ccTreehugger Robot2021-03-192-14/+21
|\| | | | |/ / |/| |
| * | Merge "Update oob data struct"Treehugger Robot2021-03-192-14/+21
|/| |
| * | Update oob data structMartin Brabham2021-03-152-14/+21
|/ /
* | Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10Paul Crowley2021-02-271-2/+3
|\ \
| * \ 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
* | | | Mark ab/7061308 as merged in stage.Xin Li2021-02-200-0/+0
|\ \ \ \
| * \ \ \ Merge "Add a function pointer to get active boot slot" am: c4b24df2ef am: 828...Tianjie Xu2020-12-111-1/+8
| |\ \ \ \
| * \ \ \ \ Merge "Add a new API for getting audio_port_v7." am: d12f224486 am: e8860846c6Treehugger Robot2020-12-091-1/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge "Delete keymaster0" am: d87b1d1ace am: a3849fec82Treehugger Robot2020-12-073-1409/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Convert mask types from uint32_t to enum type" am: 30a37a7a4b am: 1478...Treehugger Robot2020-12-011-1/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Mark ab/6881855 as merged am: 6e1b4e18f2Xin Li2020-11-250-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "Add new certificate tags defination for KeyMint V1." am: 78b8a3ffed am...Treehugger Robot2020-11-191-0/+10
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge "Add new certificate tags defination for KeyMint V1." am: 78b8a3ffed am...Treehugger Robot2020-11-191-0/+10
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." am: b1b...Treehugger Robot2020-11-031-6/+16
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." am: b1b...Treehugger Robot2020-11-031-6/+16
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [automerger skipped] Merge "Merge redfin/bramble support." am: 52e9473f1e -s ...Treehugger Robot2020-10-200-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | [automerger skipped] Merge "Merge redfin/bramble support." am: 52e9473f1e -s ...Treehugger Robot2020-10-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | [automerger skipped] Merge ab/6749736 in stage. am: 3109cbe663 -s ours am: ea...Xin Li2020-10-130-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | [automerger skipped] Merge ab/6749736 in stage. am: 3109cbe663 -s oursXin Li2020-10-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware" am: a3888bdcb9Bob Badour2021-02-1933-0/+303
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge "Add ATTEST_KEY" am: 41e68bfb11Shawn Willden2021-02-171-1/+3
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Add ATTEST_KEY"android-s-preview-1Shawn Willden2021-02-171-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add ATTEST_KEYShawn Willden2021-02-111-1/+3
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Keymint: Add CERTIFICATE_* tags" am: ead6cd16d8Janis Danisevskis2021-02-081-1/+15
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Keymint: Add CERTIFICATE_* tags"Janis Danisevskis2021-02-081-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Keymint: Add CERTIFICATE_* tagsJanis Danisevskis2021-01-311-1/+15
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge "add audio.usbv2.default linking libtinyalsav2 and libalsautilsv2" am: ...David Li2021-02-031-4/+20
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge "audio: add implementation for TV related API" am: 541a8d3e5bAndy Hung2021-01-281-0/+74
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Add limited use key tag defination." am: 3cd53f9f9dTreehugger Robot2021-01-261-0/+2
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Add KM_PURPOSE_AGREE_KEY constant." am: 203813672eDavid Zeuthen2021-01-261-0/+1
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "audio HAL: new track metadata version" am: 29ae34bcdeTreehugger Robot2021-01-071-0/+30
|\| | | | | | | | | | | |