summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-11-26Merge "Revert "keystore: Allow network_stack uid to use AID_WIFI""temp_b_145570283Roshan Pius
2019-11-26Merge "Revert "keystore: Allow network_stack uid to use AID_WIFI""Treehugger Robot
2019-11-25Revert "keystore: Allow network_stack uid to use AID_WIFI"Roshan Pius
2019-11-22Merge QQ1A.191205.011 into stage-aosp-masterXin Li
2019-11-22DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-masterXin Li
2019-11-20Merge "Don't clear kesytore after 5 auth failures."Shawn Willden
2019-11-20Merge "Don't clear kesytore after 5 auth failures."Treehugger Robot
2019-11-19Merge "Removing unused function reset()"Max Bires
2019-11-20Merge "Removing unused function reset()"Treehugger Robot
2019-11-19Merge "Allow for input_data on finish."Rob Barnes
2019-11-19Merge "Allow for input_data on finish."Rob Barnes
2019-11-14Allow for input_data on finish.Rob Barnes
2019-11-13Don't clear kesytore after 5 auth failures.Shawn Willden
2019-11-11Removing unused function reset()Max Bires
2019-11-11Merge "Add @UnsupportedAppUsage annotations for greylist."Artur Satayev
2019-11-11Merge "Add @UnsupportedAppUsage annotations for greylist."Treehugger Robot
2019-11-05Add @UnsupportedAppUsage annotations for greylist.Artur Satayev
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li
2019-10-29Merge "keystore: Move wifi keystore HAL service out"Roshan Pius
2019-10-29Merge "keystore: Move wifi keystore HAL service out"Roshan Pius
2019-10-28keystore: Move wifi keystore HAL service outRoshan Pius
2019-10-11Merge cherrypicks of [9537713, 9537701, 9537702, 9537538, 9537180, 9537181, 9...android-10.0.0_r26android-10.0.0_r22android-10.0.0_r21android-10.0.0_r16android-10.0.0_r15android10-qpr1-releaseandroid-build-team Robot
2019-10-11Encrypt AES-256 keystore master keys.Shawn Willden
2019-10-09Merge "keystore: Allow network_stack uid to use AID_WIFI"Roshan Pius
2019-10-09Merge "keystore: Allow network_stack uid to use AID_WIFI"ndk-sysroot-r21Treehugger Robot
2019-10-08keystore: Allow network_stack uid to use AID_WIFIRoshan Pius
2019-10-04Merge "Fix memory leak in keystore"Janis Danisevskis
2019-10-04Merge "Fix memory leak in keystore"Treehugger Robot
2019-10-04Fix memory leak in keystoreJanis Danisevskis
2019-10-03Merge "Fix handling of user password changes."Shawn Willden
2019-10-03Merge "Fix handling of user password changes."Treehugger Robot
2019-10-02Merge "Rewrite fsverity_init in C++ and load keys from keystore" am: a28f0d8c...Victor Hsieh
2019-10-02Merge "New APIs for a keystore client to list and get keys" am: e7dc464319 am...Victor Hsieh
2019-10-02Merge "Rewrite fsverity_init in C++ and load keys from keystore" am: a28f0d8c63Victor Hsieh
2019-10-02Merge "New APIs for a keystore client to list and get keys" am: e7dc464319Victor Hsieh
2019-10-02Merge "Rewrite fsverity_init in C++ and load keys from keystore"Victor Hsieh
2019-10-02Merge "New APIs for a keystore client to list and get keys"Victor Hsieh
2019-10-02Merge "Rewrite fsverity_init in C++ and load keys from keystore"Treehugger Robot
2019-10-02Merge "New APIs for a keystore client to list and get keys"Treehugger Robot
2019-10-01Fix handling of user password changes.Shawn Willden
2019-09-26Merge "Use libcrypto_static instead of libcrypto" am: c20dc9444e am: 56e058d71fColin Cross
2019-09-26Merge "Use libcrypto_static instead of libcrypto" am: c20dc9444eColin Cross
2019-09-26Merge "Use libcrypto_static instead of libcrypto"Colin Cross
2019-09-26Merge "Use libcrypto_static instead of libcrypto"Colin Cross
2019-09-25Rewrite fsverity_init in C++ and load keys from keystoreVictor Hsieh
2019-09-25New APIs for a keystore client to list and get keysVictor Hsieh
2019-09-21Snap for 5892339 from 83aa272cae58ad2be32b946f5d4011abefcb07e8 to qt-qpr1-rel...android-build-team Robot
2019-09-19Merge "Fix memory leak in keystore" am: b48208f2c9 am: 1af5c8b956Wenhao Wang
2019-09-19Merge "Fix memory leak in keystore" am: b48208f2c9Wenhao Wang
2019-09-19Merge "Fix memory leak in keystore"Wenhao Wang