summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-11-09Merge "Add keystore to AID_READPROC"Nick Kralevich
2015-11-07Add keystore to AID_READPROCNick Kralevich
2015-11-03Merge commit \'5c0e13490a6035296333e942623b40e23bebc110\' into HEAD am: 46fbb...Bill Yi
2015-11-03Merge commit \'5c0e13490a6035296333e942623b40e23bebc110\' into HEADBill Yi
2015-11-03Merge commit '5c0e13490a6035296333e942623b40e23bebc110' into HEADBill Yi
2015-11-02keystore: Pass kDefaultUid to Keystore service methodsGaurav Shah
2015-11-02Limit maximum number of concurrent keystore operations. am: ddab0bb513 am: 73...Shawn Willden
2015-11-02Merge "Add -Wno-unused-parameter when using libchrome." am: 19a1dcea54 am: b7...Gaurav Shah
2015-11-02Merge "Add NOTICE and MODULE_LICENSE_ files." am: e943c2f6e2 am: 06b07625c0Gaurav Shah
2015-11-02Merge "Reallocate keymaster parameters with malloc." am: 17f2c2f7ad am: 1fb19...Gaurav Shah
2015-11-02Merge "Add encryption convenience methods to KeystoreClient." am: e01125c8a9 ...Gaurav Shah
2015-11-02resolve merge conflicts of 5020f94ae4 to master.Gaurav Shah
2015-11-02Limit maximum number of concurrent keystore operations. am: ddab0bb513Shawn Willden
2015-11-02Limit maximum number of concurrent keystore operations.marshmallow-dr1.5-devShawn Willden
2015-11-02Merge "Add -Wno-unused-parameter when using libchrome." am: 19a1dcea54Gaurav Shah
2015-11-02Merge "Add NOTICE and MODULE_LICENSE_ files." am: e943c2f6e2Gaurav Shah
2015-11-02Merge "Reallocate keymaster parameters with malloc." am: 17f2c2f7adGaurav Shah
2015-11-02Merge "Add encryption convenience methods to KeystoreClient." am: e01125c8a9Gaurav Shah
2015-11-02Merge "Create a KeystoreClient class." am: 4122b99ba0Gaurav Shah
2015-11-02Merge "Add -Wno-unused-parameter when using libchrome."Gaurav Shah
2015-11-02Merge "Add NOTICE and MODULE_LICENSE_ files."Gaurav Shah
2015-11-02Merge "Reallocate keymaster parameters with malloc."Gaurav Shah
2015-11-02Merge "Add encryption convenience methods to KeystoreClient."Gaurav Shah
2015-11-02Merge "Create a KeystoreClient class."Gaurav Shah
2015-11-02Merge "Add -Wno-unused-parameter when using libchrome."brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devGaurav Shah
2015-11-02Merge "Add NOTICE and MODULE_LICENSE_ files."Gaurav Shah
2015-11-02Merge "Reallocate keymaster parameters with malloc."Gaurav Shah
2015-11-02Merge "Add encryption convenience methods to KeystoreClient."Gaurav Shah
2015-11-02Merge "Create a KeystoreClient class."Gaurav Shah
2015-11-02Add -Wno-unused-parameter when using libchrome.Jorge Lucangeli Obes
2015-11-02Add NOTICE and MODULE_LICENSE_ files.Darren Krahn
2015-11-02Reallocate keymaster parameters with malloc.Darren Krahn
2015-11-02Add encryption convenience methods to KeystoreClient.Darren Krahn
2015-11-02Create a KeystoreClient class.Darren Krahn
2015-10-30Limit maximum number of concurrent keystore operations.android-6.0.1_r63android-6.0.1_r55android-6.0.1_r5android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r18android-6.0.1_r16marshmallow-dr-dragon-releaseShawn Willden
2015-10-26Merge "Revive test script for keystore" am: 91e439b0e8 am: d91cf18037Shawn Willden
2015-10-26Merge "Revive test script for keystore" am: 91e439b0e8Shawn Willden
2015-10-26Merge "Revive test script for keystore"Shawn Willden
2015-10-26Merge "Revive test script for keystore"Shawn Willden
2015-10-22Merge "system/security: remove BORINGSSL_201509 support." am: d8feb9b2ba am: ...Kenny Root
2015-10-22Merge "system/security: remove BORINGSSL_201509 support." am: d8feb9b2baKenny Root
2015-10-22Merge "system/security: remove BORINGSSL_201509 support."Kenny Root
2015-10-22Merge "system/security: remove BORINGSSL_201509 support."Kenny Root
2015-10-16am f37d516d: am 66eec576: am 2567e491: Merge "Wrap incomplete keymaster1 impl...Shawn Willden
2015-10-16am 66eec576: am 2567e491: Merge "Wrap incomplete keymaster1 implementations w...Shawn Willden
2015-10-16am 2567e491: Merge "Wrap incomplete keymaster1 implementations with sw keymas...Shawn Willden
2015-10-16Merge "Wrap incomplete keymaster1 implementations with sw keymaster."Shawn Willden
2015-10-16Wrap incomplete keymaster1 implementations with sw keymaster.Shawn Willden
2015-10-12am f240a412: am bc22f8d6: am 410ba59a: Fix failure to save master key on new ...Chad Brubaker
2015-10-12am bc22f8d6: am 410ba59a: Fix failure to save master key on new profileChad Brubaker