Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "bpfmt." am: 0609e8d231 am: b57755c429 | Elliott Hughes | 2018-02-20 | 5 | -5/+14 |
|\ | |||||
| * | bpfmt. | Elliott Hughes | 2018-02-16 | 5 | -5/+14 |
* | | Merge "Use correct format specifier" am: 370d2e02e0 am: ef44dd2325 | Yi Kong | 2018-01-03 | 1 | -1/+1 |
|\| | |||||
| * | Use correct format specifier | Yi Kong | 2017-12-27 | 1 | -1/+1 |
* | | Merge "Remove libkeymaster_staging" | TreeHugger Robot | 2017-12-21 | 1 | -1/+0 |
|\ \ | |/ |/| | |||||
| * | Remove libkeymaster_staging | Shawn Willden | 2017-12-21 | 1 | -1/+0 |
* | | Add swillden and dkrahn to OWNERS | Shawn Willden | 2017-12-21 | 1 | -0/+2 |
|/ | |||||
* | Merge "Add OWNERS." | Elliott Hughes | 2017-12-07 | 1 | -0/+1 |
|\ | |||||
| * | Add OWNERS. | Elliott Hughes | 2017-12-07 | 1 | -0/+1 |
* | | Merge "add null pointer check for msg buffer" | Yan, Shaopu | 2017-11-28 | 1 | -0/+5 |
|\| | |||||
| * | add null pointer check for msg buffer | Yan, Shaopu | 2017-11-28 | 1 | -0/+5 |
* | | Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from | Xin Li | 2017-11-14 | 16 | -377/+21 |
|\ \ | |/ |/| | |||||
| * | resolve merge conflicts of 796987482 to stage-aosp-master am: bb5ec4a926 | Elliott Hughes | 2017-10-17 | 1 | -1/+0 |
| |\ | |||||
| * \ | Merge "Keymaster: Move test to std::unique_ptr" am: 81348ffa9e am: 346d7e1405 | Andreas Gampe | 2017-10-02 | 1 | -15/+15 |
| |\ \ | |||||
| | * \ | Merge "Keymaster: Move test to std::unique_ptr" | Andreas Gampe | 2017-10-02 | 1 | -15/+15 |
| | |\ \ | |||||
| * | | | | Merge "Add missing include for readv." am: 1f6a807bac am: 831140358d | Christopher Ferris | 2017-08-26 | 1 | -0/+1 |
| |\| | | | |||||
| | * | | | Merge "Add missing include for readv." | Christopher Ferris | 2017-08-26 | 1 | -0/+1 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge "Move trusty reference implementations to /vendor" into oc-mr1-dev | Hung-ying Tyan | 2017-08-23 | 9 | -4/+21 |
| |\ \ \ \ \ | |||||
| | * | | | | | Move trusty reference implementations to /vendor | Hung-ying Tyan | 2017-08-22 | 9 | -4/+21 |
| * | | | | | | Merge "Pass in message_version_ received from the secure side." am: 1a955faab... | Jocelyn Bohr | 2017-08-16 | 1 | -18/+18 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge "Pass in message_version_ received from the secure side." am: 1a955faab... | Jocelyn Bohr | 2017-08-16 | 1 | -18/+18 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge "Remove nvram trusty implementation." into oc-mr1-dev | Hung-ying Tyan | 2017-08-16 | 7 | -371/+0 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Remove nvram trusty implementation. | Hung-ying Tyan | 2017-08-15 | 7 | -371/+0 |
| | * | | | | | Revert "Move trusty reference implementations to /vendor" | Hung-ying Tyan | 2017-08-11 | 4 | -5/+0 |
| | * | | | | | Move trusty reference implementations to /vendor | Hung-ying Tyan | 2017-08-10 | 4 | -0/+5 |
| * | | | | | | Merge "Enable non-secure side to receive messages > 4K" am: 28fa8b0924 am: 92... | Jocelyn Bohr | 2017-08-12 | 3 | -26/+43 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge "Return correct error code when finish input length is too long." am: 9... | Jocelyn Bohr | 2017-08-03 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge "Stop asking for old versions of C++ in system/core." am: e61e2fcf21 am... | Elliott Hughes | 2017-08-03 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge "system/core: use proper nativehelper headers" am: 4f59afe9fa am: 6208c... | Steven Moreland | 2017-07-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | trusty*: Android.mk -> Android.bp | Steven Moreland | 2017-05-08 | 7 | -158/+178 |
| * | | | | | | | | | Merge "trusty/storage/* to Android.bp" am: 1dcd257a21 am: 1561e34bf4 am: 9b76... | Steven Moreland | 2017-05-05 | 10 | -133/+130 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Rename libkeymaster to libkeymaster_staging | Janis Danisevskis | 2017-05-04 | 1 | -1/+1 |
| * | | | | | | | | | | libkeymaster1 split | Janis Danisevskis | 2017-05-03 | 1 | -1/+2 |
| * | | | | | | | | | | Revert "libkeymaster1 split" | Janis Danisevskis | 2017-05-03 | 1 | -2/+1 |
| * | | | | | | | | | | libkeymaster1 split | Janis Danisevskis | 2017-05-01 | 1 | -1/+2 |
* | | | | | | | | | | | Use -Werror in system/core | Chih-Hung Hsieh | 2017-11-01 | 4 | -1/+3 |
* | | | | | | | | | | | Merge "Add missing includes." | Treehugger Robot | 2017-10-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add missing includes. | Dan Albert | 2017-10-17 | 1 | -0/+1 |
* | | | | | | | | | | | Merge "<stdbool.h> not necessary in C++." | Treehugger Robot | 2017-10-17 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | <stdbool.h> not necessary in C++. | Elliott Hughes | 2017-10-17 | 1 | -1/+0 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | libkeymaster1 split | Janis Danisevskis | 2017-10-14 | 1 | -1/+2 |
* | | | | | | | | | | Add missing includes. | Dan Albert | 2017-10-11 | 1 | -0/+2 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | Keymaster: Move test to std::unique_ptr | Andreas Gampe | 2017-10-02 | 1 | -15/+15 |
|/ / / / / / / / | |||||
* | | | | | | / | Add missing include for readv. | Christopher Ferris | 2017-08-25 | 1 | -0/+1 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge "Pass in message_version_ received from the secure side." | Treehugger Robot | 2017-08-15 | 1 | -18/+18 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Pass in message_version_ received from the secure side. | Jocelyn Bohr | 2017-08-11 | 1 | -18/+18 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge "Enable non-secure side to receive messages > 4K" | Treehugger Robot | 2017-08-12 | 3 | -26/+43 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Enable non-secure side to receive messages > 4K | Jocelyn Bohr | 2017-08-10 | 3 | -26/+43 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge "Return correct error code when finish input length is too long." | Treehugger Robot | 2017-08-03 | 1 | -1/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Return correct error code when finish input length is too long. | Jocelyn Bohr | 2017-08-03 | 1 | -1/+3 |
| |/ / / |