summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-02-01merge in oc-release history after reset to 9107985fa2d13c5fdec5d3aeaf5fe5b7cf...gitbuildkicker
2017-02-01merge in oc-release history after reset to mastergitbuildkicker
2017-01-30Phase out keymaster fallback supportJanis Danisevskis
2017-01-30Fix keystore::del to use correct keymaster device.Janis Danisevskis
2017-01-26merge in oc-release history after reset to mastergitbuildkicker
2017-01-25Fix passing wrong set of parameters in keystoreJanis Danisevskis
2017-01-25merge in oc-release history after reset to mastergitbuildkicker
2017-01-25Add device id attestationBartosz Fabianowski
2017-01-24Fix auth token conversion dropping a byteJanis Danisevskis
2017-01-24Fix auth token conversion dropping a byteJanis Danisevskis
2017-01-23Port to binderized keymaster HALJanis Danisevskis
2017-01-04Merge "fix is_secret_key_operation check" am: 7f35beb6cb am: 216b33f09c am: 4...Janis Danisevskis
2017-01-04Merge "fix is_secret_key_operation check" am: 7f35beb6cb am: 216b33f09candroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Janis Danisevskis
2017-01-04Merge "fix is_secret_key_operation check" am: 7f35beb6cbJanis Danisevskis
2017-01-04Merge "fix is_secret_key_operation check"Janis Danisevskis
2017-01-04Merge "fix is_secret_key_operation check"android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1o-previewTreehugger Robot
2017-01-04fix is_secret_key_operation checkJanis Danisevskis
2016-12-12Disable keystore build in the PDKDan Willemsen
2016-12-12Merge "permissions.cpp: remove is_selinux_enabled calls" am: ac28b58488 am: 2...Nick Kralevich
2016-12-12Merge "permissions.cpp: remove is_selinux_enabled calls" am: ac28b58488 am: 2...Nick Kralevich
2016-12-12Merge "permissions.cpp: remove is_selinux_enabled calls" am: ac28b58488Nick Kralevich
2016-12-12Merge "permissions.cpp: remove is_selinux_enabled calls"Nick Kralevich
2016-12-12Merge "permissions.cpp: remove is_selinux_enabled calls"Treehugger Robot
2016-12-09permissions.cpp: remove is_selinux_enabled callsNick Kralevich
2016-12-08Merge "Fix issue: upgradeKeyBlob call always return PERMISSION_DENIED." am: 5...Ji Wang
2016-12-08Merge "Fix issue: upgradeKeyBlob call always return PERMISSION_DENIED." am: 5...Ji Wang
2016-12-08Merge "Fix issue: upgradeKeyBlob call always return PERMISSION_DENIED." am: 5...Ji Wang
2016-12-08Merge "Fix issue: upgradeKeyBlob call always return PERMISSION_DENIED."Ji Wang
2016-12-08Merge "Fix issue: upgradeKeyBlob call always return PERMISSION_DENIED."Treehugger Robot
2016-12-08Fix issue: upgradeKeyBlob call always return PERMISSION_DENIED.Ji Wang
2016-10-21Merge "keystore: add upgradeKeyBlob call into keystore exportKey." am: 235453...Ji Wang
2016-10-21keystore: add upgradeKeyBlob call into keystore exportKey. am: 2c1423111a am:...Ji Wang
2016-10-21Merge "keystore: add upgradeKeyBlob call into keystore exportKey." am: 235453...Ji Wang
2016-10-21keystore: add upgradeKeyBlob call into keystore exportKey. am: 2c1423111aJi Wang
2016-10-21Merge "keystore: add upgradeKeyBlob call into keystore exportKey."Ji Wang
2016-10-21keystore: add upgradeKeyBlob call into keystore exportKey.Ji Wang
2016-10-21Merge "keystore: add upgradeKeyBlob call into keystore exportKey."Treehugger Robot
2016-10-14keystore: add upgradeKeyBlob call into keystore exportKey.Ji Wang
2016-10-06resolve merge conflicts of 0ab28b7 to nyc-mr1-dev-plus-aospTucker Sylvestro
2016-10-06resolve merge conflicts of 0ab28b7 to nyc-mr1-dev-plus-aospTucker Sylvestro
2016-10-05Support and use TAG_ALLOW_WHILE_ON_BODYandroid-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devTucker Sylvestro
2016-09-28Merge "keystore: fix memory leak from readKeymasterBlob" am: 3746fcf327 am: 1...Chad Brubaker
2016-09-28Merge "keystore: use static_cast for conversion between void* and uinti8_t*" ...Chad Brubaker
2016-09-28Merge "KeyCharacteristics implement Parcelable interface" am: 386ee11839 am: ...Chad Brubaker
2016-09-28Merge changes I6873ee37,Ia18ee6e4 am: 3ccb133274 am: 204e5eed73 am: 3aa6a436deChad Brubaker
2016-09-28ExportResult implement Parcelable interface am: 96d62710a0 am: db6ccd4d03 am:...Bin Chen
2016-09-28OperationResult implements Parcelable interface am: 9ec9270dbb am: 62e4fa28a9...Bin Chen
2016-09-28Merge "keystore: fix memory leak from readKeymasterBlob" am: 3746fcf327 am: 1...Chad Brubaker
2016-09-28Merge "keystore: use static_cast for conversion between void* and uinti8_t*" ...Chad Brubaker
2016-09-28Merge "KeyCharacteristics implement Parcelable interface" am: 386ee11839 am: ...Chad Brubaker
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 20:17:22 +0000