Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / security / e03631fbfdf7ee8a9f743982217c0f3996453cd5
  1. e03631f Merge "Merge Android10 QPR1 into AOSP master" am: 6bb1c31d3c by Xin Li · 4 years, 7 months ago
  2. 6bb1c31 Merge "Merge Android10 QPR1 into AOSP master" by Treehugger Robot · 4 years, 7 months ago
  3. f910c8e Merge Android10 QPR1 into AOSP master by Xin Li · 4 years, 7 months ago
  4. 58c34c2 Merge "Revert "keystore: Allow network_stack uid to use AID_WIFI"" by Roshan Pius · 4 years, 7 months ago
  5. be24e3f Merge "Revert "keystore: Allow network_stack uid to use AID_WIFI"" by Treehugger Robot · 4 years, 7 months ago
  6. 2bc07e0 Revert "keystore: Allow network_stack uid to use AID_WIFI" by Roshan Pius · 4 years, 7 months ago
  7. 9222cc6 Merge QQ1A.191205.011 into stage-aosp-master by Xin Li · 4 years, 7 months ago
  8. 3b518f4 DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master by Xin Li · 4 years, 7 months ago
  9. 3b35993 Merge "Don't clear kesytore after 5 auth failures." am: 44f4d85dcf by Shawn Willden · 4 years, 7 months ago
  10. 44f4d85 Merge "Don't clear kesytore after 5 auth failures." by Treehugger Robot · 4 years, 7 months ago
  11. c8c38cc Merge "Removing unused function reset()" am: 5a053ab455 by Max Bires · 4 years, 8 months ago
  12. 5a053ab Merge "Removing unused function reset()" by Treehugger Robot · 4 years, 8 months ago
  13. 3f2b9f1 Merge "Allow for input_data on finish." am: fb2c9b1ee9 by Rob Barnes · 4 years, 8 months ago
  14. fb2c9b1 Merge "Allow for input_data on finish." by Rob Barnes · 4 years, 8 months ago
  15. 3af223f Allow for input_data on finish. by Rob Barnes · 4 years, 8 months ago
  16. 688d3ab Don't clear kesytore after 5 auth failures. by Shawn Willden · 4 years, 9 months ago
  17. 9896620 Removing unused function reset() by Max Bires · 4 years, 9 months ago
  18. 650c889 Merge "Add @UnsupportedAppUsage annotations for greylist." am: 5f5576fe93 by Artur Satayev · 4 years, 8 months ago
  19. 5f5576f Merge "Add @UnsupportedAppUsage annotations for greylist." by Treehugger Robot · 4 years, 8 months ago
  20. abbb2bf Add @UnsupportedAppUsage annotations for greylist. by Artur Satayev · 4 years, 8 months ago
  21. e728851 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master by Xin Li · 4 years, 8 months ago
  22. 29f46c4 Merge "keystore: Move wifi keystore HAL service out" am: 2c62e2b83e by Roshan Pius · 4 years, 8 months ago
  23. 2c62e2b Merge "keystore: Move wifi keystore HAL service out" by Roshan Pius · 4 years, 8 months ago
  24. 2650acc keystore: Move wifi keystore HAL service out by Roshan Pius · 4 years, 9 months ago
  25. ec8dc7f Merge cherrypicks of [9537713, 9537701, 9537702, 9537538, 9537180, 9537181, 9537182, 9537183, 9537764, 9537703, 9537784, 9537785, 9537714, 9537715, 9537716, 9537717, 9537786, 9537718, 9537719, 9537720, 9537721, 9537722, 9537787, 9537788, 9537723, 9537804, 9537805, 9537789] into qt-qpr1-release by android-build-team Robot · 4 years, 9 months ago
  26. c9349a5 Encrypt AES-256 keystore master keys. by Shawn Willden · 4 years, 9 months ago
  27. 64aa1b5 Merge "keystore: Allow network_stack uid to use AID_WIFI" am: 9ff0edfe26 by Roshan Pius · 4 years, 9 months ago
  28. 9ff0edf Merge "keystore: Allow network_stack uid to use AID_WIFI" by Treehugger Robot · 4 years, 9 months ago
  29. 286c4b0 keystore: Allow network_stack uid to use AID_WIFI by Roshan Pius · 4 years, 9 months ago
  30. 9666e63 Merge "Fix memory leak in keystore" am: a5273d9a57 by Janis Danisevskis · 4 years, 9 months ago
  31. a5273d9 Merge "Fix memory leak in keystore" by Treehugger Robot · 4 years, 9 months ago
  32. 8c4c1d6 Fix memory leak in keystore by Janis Danisevskis · 4 years, 9 months ago
  33. 90dad89 Merge "Fix handling of user password changes." am: 946f1d11c0 by Shawn Willden · 4 years, 9 months ago
  34. 946f1d1 Merge "Fix handling of user password changes." by Treehugger Robot · 4 years, 9 months ago
  35. e690377 Merge "Rewrite fsverity_init in C++ and load keys from keystore" am: a28f0d8c63 am: 158361d164 by Victor Hsieh · 4 years, 9 months ago
  36. 6ccaf18 Merge "New APIs for a keystore client to list and get keys" am: e7dc464319 am: 3f903ce422 by Victor Hsieh · 4 years, 9 months ago
  37. 2bda7cc Merge "Rewrite fsverity_init in C++ and load keys from keystore" am: a28f0d8c63 by Victor Hsieh · 4 years, 9 months ago
  38. 96308c7 Merge "New APIs for a keystore client to list and get keys" am: e7dc464319 by Victor Hsieh · 4 years, 9 months ago
  39. 158361d Merge "Rewrite fsverity_init in C++ and load keys from keystore" am: a28f0d8c63 by Victor Hsieh · 4 years, 9 months ago
  40. 3f903ce Merge "New APIs for a keystore client to list and get keys" am: e7dc464319 by Victor Hsieh · 4 years, 9 months ago
  41. a28f0d8 Merge "Rewrite fsverity_init in C++ and load keys from keystore" by Treehugger Robot · 4 years, 9 months ago
  42. e7dc464 Merge "New APIs for a keystore client to list and get keys" by Treehugger Robot · 4 years, 9 months ago
  43. 17b8709 Fix handling of user password changes. by Shawn Willden · 4 years, 9 months ago
  44. 2bc19b2 Merge "Use libcrypto_static instead of libcrypto" am: c20dc9444e am: 56e058d71f by Colin Cross · 4 years, 9 months ago
  45. 471e961 Merge "Use libcrypto_static instead of libcrypto" am: c20dc9444e am: 56e058d71f by Colin Cross · 4 years, 9 months ago
  46. 56e058d Merge "Use libcrypto_static instead of libcrypto" am: c20dc9444e by Colin Cross · 4 years, 9 months ago
  47. c20dc94 Merge "Use libcrypto_static instead of libcrypto" by Colin Cross · 4 years, 9 months ago
  48. d0a4b20 Rewrite fsverity_init in C++ and load keys from keystore by Victor Hsieh · 4 years, 10 months ago
  49. 8b3b6fc New APIs for a keystore client to list and get keys by Victor Hsieh · 4 years, 10 months ago
  50. 0d466c9 Snap for 5892339 from 83aa272cae58ad2be32b946f5d4011abefcb07e8 to qt-qpr1-release by android-build-team Robot · 4 years, 9 months ago
  51. c2b7c8a Merge "Fix memory leak in keystore" am: b48208f2c9 am: 1af5c8b956 am: a54c275af2 by Wenhao Wang · 4 years, 10 months ago
  52. a54c275 Merge "Fix memory leak in keystore" am: b48208f2c9 am: 1af5c8b956 by Wenhao Wang · 4 years, 10 months ago
  53. 1af5c8b Merge "Fix memory leak in keystore" am: b48208f2c9 by Wenhao Wang · 4 years, 10 months ago
  54. b48208f Merge "Fix memory leak in keystore" by Wenhao Wang · 4 years, 10 months ago
  55. 0345d1a [automerger skipped] Fixed unchecked key blob access in attestKey by Janis Danisevskis · 4 years, 10 months ago
  56. aebf663 Use libcrypto_static instead of libcrypto by Colin Cross · 4 years, 10 months ago
  57. 81fa413 Merge "Allow system and root to access fsverity keys" am: aad4f6ed19 am: 4efda9db46 by Victor Hsieh · 4 years, 10 months ago
  58. d48f312 Merge "Allow system and root to access fsverity keys" am: aad4f6ed19 by Victor Hsieh · 4 years, 10 months ago
  59. 4efda9d Merge "Allow system and root to access fsverity keys" am: aad4f6ed19 by Victor Hsieh · 4 years, 10 months ago
  60. aad4f6e Merge "Allow system and root to access fsverity keys" by Treehugger Robot · 4 years, 10 months ago
  61. 83aa272 Fixed unchecked key blob access in attestKey by Janis Danisevskis · 5 years ago
  62. 89a6870 Merge "Don't fail attestation on missing app ID" am: 5386377bfb am: 8bac7ba894 by Shawn Willden · 4 years, 10 months ago
  63. a63f99d Merge "Don't fail attestation on missing app ID" am: 5386377bfb am: 8bac7ba894 by Shawn Willden · 4 years, 10 months ago
  64. 8bac7ba Merge "Don't fail attestation on missing app ID" am: 5386377bfb by Shawn Willden · 4 years, 10 months ago
  65. 5386377 Merge "Don't fail attestation on missing app ID" by Treehugger Robot · 4 years, 10 months ago
  66. 6f7d27c Don't fail attestation on missing app ID by Shawn Willden · 4 years, 10 months ago
  67. 368b409 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: a07b9dec32 -s ours by Xin Li · 4 years, 10 months ago
  68. 2b54b20 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master by Xin Li · 4 years, 10 months ago
  69. a07b9de Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master by Xin Li · 4 years, 10 months ago
  70. 33438c6 Merge "Remove libhwbinder/libhidltransport deps" am: ce605a225a am: ecf7705051 by Steven Moreland · 4 years, 10 months ago
  71. 621d2ce Merge "Remove libhwbinder/libhidltransport deps" am: ce605a225a am: ecf7705051 by Steven Moreland · 4 years, 10 months ago
  72. ecf7705 Merge "Remove libhwbinder/libhidltransport deps" am: ce605a225a by Steven Moreland · 4 years, 10 months ago
  73. ce605a2 Merge "Remove libhwbinder/libhidltransport deps" by Treehugger Robot · 4 years, 10 months ago
  74. 58c10ac Allow system and root to access fsverity keys by Victor Hsieh · 4 years, 10 months ago
  75. 311e9bc [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 1ba438c4ac -s ours am: a75e178952 -s ours am: de01a2b31b by Xin Li · 4 years, 10 months ago
  76. a2412d1 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 1ba438c4ac -s ours am: a75e178952 -s ours by Xin Li · 4 years, 10 months ago
  77. de01a2b [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 1ba438c4ac -s ours by Xin Li · 4 years, 10 months ago
  78. a75e178 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" by Xin Li · 4 years, 10 months ago
  79. b24d5a2 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: c908dbe5dd -s ours am: 05daf136dc -s ours am: eb72b91304 by Xin Li · 4 years, 10 months ago
  80. 60885ba [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: c908dbe5dd -s ours am: 05daf136dc -s ours by Xin Li · 4 years, 10 months ago
  81. de99a52 Remove libhwbinder/libhidltransport deps by Steven Moreland · 4 years, 10 months ago
  82. eb72b91 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: c908dbe5dd -s ours by Xin Li · 4 years, 10 months ago
  83. 05daf13 [automerger skipped] DO NOT MERGE - Merge Android 10 into master by Xin Li · 4 years, 10 months ago
  84. 1ba438c Merge "DO NOT MERGE - Merge Android 10 into master" by Xin Li · 4 years, 10 months ago
  85. afd8a65 Merge "Make keystore a core service" am: 04b8903804 am: 5f58b20b00 am: 73d27984f6 by Victor Hsieh · 4 years, 10 months ago
  86. b88ae67 Merge "Make keystore a core service" am: 04b8903804 am: 5f58b20b00 by Victor Hsieh · 4 years, 10 months ago
  87. 73d2798 Merge "Make keystore a core service" am: 04b8903804 am: 5f58b20b00 by Victor Hsieh · 4 years, 10 months ago
  88. 5f58b20 Merge "Make keystore a core service" am: 04b8903804 by Victor Hsieh · 4 years, 10 months ago
  89. 04b8903 Merge "Make keystore a core service" by Treehugger Robot · 4 years, 10 months ago
  90. c908dbe DO NOT MERGE - Merge Android 10 into master by Xin Li · 4 years, 10 months ago
  91. bec8999 Fix memory leak in keystore by Janis Danisevskis · 4 years, 11 months ago
  92. 7fd8e85 Make keystore a core service by Victor Hsieh · 4 years, 10 months ago
  93. 1cf7a7e Merge "Check correct err variable on wifi keystore HAL" am: 81f35573c7 am: 523a912137 am: 7b54866cf2 by Wenhao Wang · 4 years, 10 months ago
  94. 9cbd06d Merge "Check correct err variable on wifi keystore HAL" am: 81f35573c7 am: 523a912137 by Wenhao Wang · 4 years, 10 months ago
  95. 7b54866 Merge "Check correct err variable on wifi keystore HAL" am: 81f35573c7 by Wenhao Wang · 4 years, 10 months ago
  96. 523a912 Merge "Check correct err variable on wifi keystore HAL" am: 81f35573c7 by Wenhao Wang · 4 years, 10 months ago
  97. 81f3557 Merge "Check correct err variable on wifi keystore HAL" by Wenhao Wang · 4 years, 10 months ago
  98. 0ff2568 Check correct err variable on wifi keystore HAL by Wenhao Wang · 4 years, 11 months ago
  99. b2eee45 Merge "Replace custom BoringSSL scopers with bssl::UniquePtr." am: 147f3df5c3 am: e2d3e0b584 am: c3704f0d81 by David Benjamin · 4 years, 11 months ago
  100. 884e1ed Merge "Replace custom BoringSSL scopers with bssl::UniquePtr." am: 147f3df5c3 am: e2d3e0b584 by David Benjamin · 4 years, 11 months ago