summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.4_r1' into cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Ricardo Cerqueira2013-11-0118-451/+1602
|\
| * Set encrypted flag when appropriateKenny Root2013-10-071-1/+8
| * am 1d486fb3: am 02d44fe7: Move key name creation to common pathKenny Root2013-09-090-0/+0
| |\
| | * am 02d44fe7: Move key name creation to common pathKenny Root2013-09-091-23/+6
| | |\
| | | * Move key name creation to common pathKenny Root2013-09-091-23/+6
| * | | Move key name creation to common pathKenny Root2013-09-091-23/+6
| * | | Revert to old-style API for EC_KEY handlingKenny Root2013-09-074-130/+166
| * | | Add argument to binder call to check key typesKenny Root2013-09-053-7/+23
| * | | Provide fallback for keymaster implementationsKenny Root2013-09-048-103/+270
| * | | Add support for DSA and ECDSA key typesKenny Root2013-09-0311-113/+933
| |/ /
| * | am e2a878e9: Merge "Revert "Revert "Split up main engine from methods"""Kenny Root2013-06-275-263/+385
| |\ \
| | * \ Merge "Revert "Revert "Split up main engine from methods"""Kenny Root2013-06-275-263/+385
| | |\ \
| | | * | Revert "Revert "Split up main engine from methods""Kenny Root2013-06-275-263/+385
| | |/ /
| * | | am 3aca7a31: Merge "Revert "Split up main engine from methods""Kenny Root2013-06-274-381/+262
| |\| |
| | * | Merge "Revert "Split up main engine from methods""Kenny Root2013-06-274-381/+262
| | |\ \
| | | * | Revert "Split up main engine from methods"Kenny Root2013-06-274-381/+262
| * | | | am bb621b36: Merge "Split up main engine from methods"Kenny Root2013-06-274-262/+381
| |\| | |
| | * | | Merge "Split up main engine from methods"Kenny Root2013-06-274-262/+381
| | |\| |
| | | * | Split up main engine from methodsKenny Root2013-06-264-262/+381
| | |/ /
| * | | am a65d5236: Merge "Add 1 byte for the NULL char. This bug was causing CTS fa...Kenny Root2013-06-241-3/+3
| |\| |
| | * | Merge "Add 1 byte for the NULL char. This bug was causing CTS failures and st...Kenny Root2013-06-241-3/+3
| | |\ \
| | | * | Add 1 byte for the NULL char. This bug was causing CTS failures and stack cor...Douglas Leung2013-06-131-3/+3
| | |/ /
| * | | am 76820356: Merge "keystore: fix import as other UIDs"Kenny Root2013-04-180-0/+0
| |\| |
| | * | Merge "keystore: fix import as other UIDs"Kenny Root2013-04-181-1/+1
| | |\ \
| | | * | keystore: fix import as other UIDsKenny Root2013-04-181-1/+1
| | |/ /
| * | | am 360f51f7: keystore: fix import as other UIDsKenny Root2013-04-171-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | am 1223495e: Merge "keystore: Add flag for blobs to be unencrypted"Kenny Root2013-04-150-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Merge "keystore: Add flag for blobs to be unencrypted"Kenny Root2013-04-155-72/+134
| | |\ \
| | | * | keystore: Add flag for blobs to be unencryptedKenny Root2013-04-155-72/+134
| | |/ /
| * | | am b3fc31a4: Merge "keystore: fix bug in clear_uid"Kenny Root2013-04-150-0/+0
| |\| |
| | * | Merge "keystore: fix bug in clear_uid"Kenny Root2013-04-151-1/+1
| | |\ \
| | | * | keystore: fix bug in clear_uidKenny Root2013-04-151-1/+1
| | |/ /
| * | | am 5d884972: Merge "keystore: Add flag for blobs to be unencrypted" into jb-m...Kenny Root2013-04-125-72/+134
| |\ \ \
| * \ \ \ am aae26fc0: keystore: fix bug in clear_uidKenny Root2013-04-121-1/+1
| |\ \ \ \
| * \ \ \ \ am a6fe6209: Add liblogYing Wang2013-04-091-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ am 92af9812: Merge "keystore: Add multi-user support"Kenny Root2013-04-060-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "keystore: Add multi-user support"Kenny Root2013-04-061-257/+615
| | |\ \ \ \ \
| | | * | | | | keystore: Add multi-user supportKenny Root2013-04-061-257/+615
| | |/ / / / /
| * | | | | | am 68b46319: keystore: Add multi-user supportKenny Root2013-04-061-257/+615
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 56995079: Merge "keystore: fix inverted hardware keystore check"Kenny Root2013-04-040-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "keystore: fix inverted hardware keystore check"Kenny Root2013-04-051-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | keystore: fix inverted hardware keystore checkKenny Root2013-04-041-1/+1
| | |/ / / / / /
| * | | | | | | am 77c4e48e: Merge "Fix CL split and build"Kenny Root2013-04-040-0/+0
| |\| | | | | |
| | * | | | | | Merge "Fix CL split and build"Kenny Root2013-04-041-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Fix CL split and buildKenny Root2013-04-041-1/+1
| * | | | | | | | Merge "resolved conflicts for merge of a2f747d4 to jb-mr2-dev-plus-aosp" into...Kenny Root2013-04-050-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | resolved conflicts for merge of a2f747d4 to jb-mr2-dev-plus-aospKenny Root2013-04-040-0/+0
| | |\| | | | | | |
| | | * | | | | | | Merge "keystore: fix upgrades"Kenny Root2013-04-041-4/+14
| | | |\| | | | | |
| | | | * | | | | | keystore: fix upgradesKenny Root2013-04-041-4/+14
| | | |/ / / / / /
| * | | | | | | | am 4d93d246: keystore: fix inverted hardware keystore checkKenny Root2013-04-041-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 19:05:16 +0000