summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-9.0.0_r51' of https://android.googlesource.com/platform/sy...HEADp9.0mosimchah2019-12-131-1/+1
|\
| * Encrypt AES-256 keystore master keys.Shawn Willden2019-10-092-1/+2
| * Fix keystore wifi concurrency issue.Janis Danisevskis2019-05-102-0/+55
| * keystore: abort if verification token generation failsnagendra modadugu2018-12-061-2/+14
| * Snap for 4801384 from 2eef1356a8c0d2592f8d0e8af63ecbec81d59c5a to pi-releaseandroid-build-team Robot2018-05-244-6/+34
| |\
| * \ Snap for 4778776 from 41705f271e14558e66125fed4b9b9510fd475fd8 to pi-releaseandroid-build-team Robot2018-05-132-59/+22
| |\ \
| * \ \ Snap for 4751833 from 33aac2dda210791b4ba155d204ceff56b77a28a9 to pi-releaseandroid-build-team Robot2018-04-2912-39/+488
| |\ \ \
| * \ \ \ Snap for 4739962 from cf91dcdee36775965938f5535480d6345821b459 to pi-releaseandroid-build-team Robot2018-04-241-1/+0
| |\ \ \ \
| * \ \ \ \ Snap for 4698807 from 6e2e1afad871394e488b2a145961dd90edb24076 to pi-releaseandroid-build-team Robot2018-04-041-5/+5
| |\ \ \ \ \
| * \ \ \ \ \ Snap for 4696032 from 78daac2ca8d2ed82f9612e431f337fdefe5528c4 to pi-releaseandroid-build-team Robot2018-04-032-1/+21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Snap for 4693621 from de5eee4f9e46881a0a7b389df1e64af5d20b0ca8 to pi-releaseandroid-build-team Robot2018-04-019-5/+64
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Snap for 4683893 from 4a1da2f371de41a397a019020d402b95b0d9dd7e to pi-releaseandroid-build-team Robot2018-03-281-0/+20
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Snap for 4670666 from fa3a2f294ffc298da295ad33d8a5d8fbd26e6f3c to pi-releaseandroid-build-team Robot2018-03-221-1/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Snap for 4667902 from 439e29d4a8258be6fd91b35344cbe2e060a06457 to pi-releaseandroid-build-team Robot2018-03-216-2/+415
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Snap for 4625912 from eec88d343a1105d4da5c108c49258e2ccc131f4a to pi-releaseandroid-build-team Robot2018-02-285-18/+41
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Snap for 4620899 from cee5f1213d41f352ac54b1f437e6aadca12e81a5 to pi-releaseandroid-build-team Robot2018-02-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge cherrypicks of [3653390, 3653430, 3652255, 3652256, 3652257, 3653371, 3...android-build-team Robot2018-02-238-51/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Revert "Restore "Add "Unlocked device required" parameter to keys""Brian Young2018-02-238-51/+4
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Snap for 4610834 from 0f160fbaee9ecf472feb3e332f01c4ddb95caa0e to pi-releaseandroid-build-team Robot2018-02-1812-21/+107
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4605948 from 3bd6a51a6d49e465bcb03a43998f5bd9367fb59c to pi-releaseandroid-build-team Robot2018-02-1510-0/+289
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4577102 from 5eec4382f2f49f87e3329daabf1db6ebe651e8fc to pi-releaseandroid-build-team Robot2018-01-313-3/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge cherrypicks of [3535875, 3534641, 3534642, 3536651, 3536652, 3536653, 3...android-build-team Robot2018-01-307-41/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Revert "Add "Unlocked device required" parameter to keys"Brian Young2018-01-307-41/+3
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Snap for 4574286 from 8433ec753dabeafdcec06daa2a2c7a03d97895d1 to pi-releaseandroid-build-team Robot2018-01-307-3/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Snap for 4571561 from cd416c5ec587b7ba42ad497f56f8fbf3ac1659d7 to pi-releaseandroid-build-team Robot2018-01-2811-93/+513
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Snap for 4562879 from ec35536ef9f3a1929cbe0efd15bec49a0a659b64 to pi-releaseandroid-build-team Robot2018-01-241-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Snap for 4560043 from 0a198a0412d45b394d803d60b906b0c72aca8d2d to pi-releaseandroid-build-team Robot2018-01-231-7/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | merge in pi-release history after reset to mastergitbuildkicker2018-01-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-220-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Snap for 4557233 from eedcfe96d1b4517eb5201a8557aedc00d806c88a to pi-releaseandroid-build-team Robot2018-01-2111-736/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Snap for 4551672 from c8cdf0ec734ec181bf705b1d4f1a6a787bcd2054 to pi-releaseandroid-build-team Robot2018-01-182-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4533842 from ab65cd0e89829675fec75d629019b10511584100 to pi-releaseandroid-build-team Robot2018-01-091-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4531101 from adbb6149d39960bb6edd958a9b3500a64c096b31 to pi-releaseandroid-build-team Robot2018-01-074-10/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge cherrypicks of [3423221, 3422977] into pi-releaseandroid-build-team Robot2018-01-051-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | Disable CFI for the keystore unit tests.Vishwath Mohan2018-01-051-0/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Snap for 4523885 from d7876e63715e7adb43be86c6d99176dbb15233b9 to pi-releaseandroid-build-team Robot2018-01-031-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4521654 from abaf4d88d8ef3061de05da7034fc28b2ba880e71 to pi-releaseandroid-build-team Robot2017-12-313-14/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4519870 from cb9267dc53cb715c09ef276562dbe88b0d999a8d to pi-releaseandroid-build-team Robot2017-12-2836-926/+670
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4517567 from 2e0282a08da498711e9ff89517465f15d262c23b to pi-releaseandroid-build-team Robot2017-12-2431-512/+1179
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4510491 from 0efbf432c1bc5bf52f93c73f8c9ba7476ce4bca7 to pi-releaseandroid-build-team Robot2017-12-2020-263/+169
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4509671 from 8bc0be07d67fd21bff2fe3710dbca0cee03a9805 to pi-releaseandroid-build-team Robot2017-12-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4507345 from c7db2a54b2a19ec4123f8a7c700235df66904eed to pi-releaseandroid-build-team Robot2017-12-177-9/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4502278 from 9f9728661b07bda7a9cdcac0a77693a9533a5bf4 to pi-releaseandroid-build-team Robot2017-12-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4496165 from d060d87468e16a34c56bd8d609a40890779bf666 to pi-releaseandroid-build-team Robot2017-12-111-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4489599 from 1b521657cc40fc2e1e99d7224768902853302bff to pi-releaseandroid-build-team Robot2017-12-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4481641 from 0e69ef0c0f1d3e1568067664b1ad9b672f8e9fcc to pi-releaseandroid-build-team Robot2017-12-031-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \