Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / b0519d0d1ea5dc58ce3a8aa3951e686ad6122c27
  1. b0519d0 [automerger skipped] Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 -s ours am: 068fbe2ea9 -s ours am: 82daf3dcad -s ours by Paul Crowley · 3 years, 5 months ago
  2. 74547c3 [automerger skipped] Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 am: eae11551bd -s ours am: 23ba1a1b0d -s ours by Paul Crowley · 3 years, 5 months ago
  3. d3c5dcb [automerger skipped] Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee -s ours am: e4190a395a -s ours am: 22922e708e -s ours by Shawn Willden · 3 years, 5 months ago
  4. 82daf3d [automerger skipped] Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 -s ours am: 068fbe2ea9 -s ours by Paul Crowley · 3 years, 5 months ago
  5. 23ba1a1 [automerger skipped] Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 am: eae11551bd -s ours by Paul Crowley · 3 years, 5 months ago
  6. 215eb9f [automerger skipped] Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee am: fb0d651988 -s ours am: 95b5da6fd4 -s ours by Shawn Willden · 3 years, 5 months ago
  7. 068fbe2 [automerger skipped] Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 -s ours by Paul Crowley · 3 years, 5 months ago
  8. eae1155 Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 by Paul Crowley · 3 years, 5 months ago
  9. 1566a5b Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev by Paul Crowley · 3 years, 5 months ago
  10. d31f36d Revert^2 "Detect factory reset and deleteAllKeys" by Paul Crowley · 3 years, 5 months ago
  11. 22922e7 [automerger skipped] Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee -s ours am: e4190a395a -s ours by Shawn Willden · 3 years, 5 months ago
  12. 95b5da6 [automerger skipped] Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee am: fb0d651988 -s ours by Shawn Willden · 3 years, 5 months ago
  13. fb0d651 Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee by Shawn Willden · 3 years, 5 months ago
  14. e4190a3 [automerger skipped] Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee -s ours by Shawn Willden · 3 years, 5 months ago
  15. 90c818d Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev by Shawn Willden · 3 years, 5 months ago
  16. 2bab97c Revert "Detect factory reset and deleteAllKeys" by Shawn Willden · 3 years, 5 months ago
  17. e4abb07 Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: 7c5c6d8b43 am: 7d81779ba3 by TreeHugger Robot · 3 years, 5 months ago
  18. 22330ce Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: 7c5c6d8b43 am: a2a6fc14d2 by TreeHugger Robot · 3 years, 5 months ago
  19. 4fc0a89 Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: d7b96bc64f am: f7f01defb4 by TreeHugger Robot · 3 years, 5 months ago
  20. a2a6fc1 Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: 7c5c6d8b43 by TreeHugger Robot · 3 years, 5 months ago
  21. 7d81779 Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: 7c5c6d8b43 by TreeHugger Robot · 3 years, 5 months ago
  22. f7f01de Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: d7b96bc64f by TreeHugger Robot · 3 years, 5 months ago
  23. 7c5c6d8 Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 by TreeHugger Robot · 3 years, 5 months ago
  24. d7b96bc Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 by TreeHugger Robot · 3 years, 5 months ago
  25. 8f19fd9 Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev by TreeHugger Robot · 3 years, 5 months ago
  26. 091b29d Merge "[automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 am: e00101c162 -s ours am: f54a94de16 -s ours" into sc-v2-dev-plus-aosp by Automerger Merge Worker · 3 years, 5 months ago
  27. 1371b05 [automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 am: e00101c162 -s ours am: f54a94de16 -s ours by Paul Crowley · 3 years, 5 months ago
  28. 3a1ebaf [automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 am: e00101c162 am: 62b8b5c7a5 -s ours by Paul Crowley · 3 years, 5 months ago
  29. 56dd594 [automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 -s ours am: 2160b23d14 -s ours am: 94a55ae9c0 -s ours by Paul Crowley · 3 years, 5 months ago
  30. 62b8b5c Detect factory reset and deleteAllKeys am: 0f74bd4811 am: e00101c162 by Paul Crowley · 3 years, 5 months ago
  31. f54a94d [automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 am: e00101c162 -s ours by Paul Crowley · 3 years, 5 months ago
  32. 94a55ae [automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 -s ours am: 2160b23d14 -s ours by Paul Crowley · 3 years, 5 months ago
  33. e00101c Detect factory reset and deleteAllKeys am: 0f74bd4811 by Paul Crowley · 3 years, 5 months ago
  34. 2160b23 [automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 -s ours by Paul Crowley · 3 years, 5 months ago
  35. 2601eb7 Add ROLLBACK_RESISTANCE tag to key usage by [6;7~ · 3 years, 5 months ago
  36. 96ffa27 Merge "Detect factory reset and deleteAllKeys" am: 407b2c2386 am: 85961f7a9c am: c248576dad am: 96b31a40b7 by Paul Crowley · 3 years, 5 months ago
  37. 96b31a4 Merge "Detect factory reset and deleteAllKeys" am: 407b2c2386 am: 85961f7a9c am: c248576dad by Paul Crowley · 3 years, 5 months ago
  38. c248576 Merge "Detect factory reset and deleteAllKeys" am: 407b2c2386 am: 85961f7a9c by Paul Crowley · 3 years, 5 months ago
  39. 85961f7 Merge "Detect factory reset and deleteAllKeys" am: 407b2c2386 by Paul Crowley · 3 years, 5 months ago
  40. 0f74bd4 Detect factory reset and deleteAllKeys by Paul Crowley · 3 years, 5 months ago
  41. 407b2c2 Merge "Detect factory reset and deleteAllKeys" by Paul Crowley · 3 years, 5 months ago
  42. 1e6a5f5 Detect factory reset and deleteAllKeys by Paul Crowley · 3 years, 5 months ago
  43. 4742073 Merge "Remove ndk_platform backend. Use the ndk backend." am: 85705f6c86 am: e66b2b4015 am: ff366fab5f by Treehugger Robot · 3 years, 5 months ago
  44. ff366fa Merge "Remove ndk_platform backend. Use the ndk backend." am: 85705f6c86 am: e66b2b4015 by Treehugger Robot · 3 years, 5 months ago
  45. e66b2b4 Merge "Remove ndk_platform backend. Use the ndk backend." am: 85705f6c86 by Treehugger Robot · 3 years, 5 months ago
  46. 85705f6 Merge "Remove ndk_platform backend. Use the ndk backend." by Treehugger Robot · 3 years, 5 months ago
  47. 5f7169f Merge "Remove vold logs related to block devices" am: cbf82ffa29 am: 9bf8553f8d am: 78c9cba6a5 by Nikita Ioffe · 3 years, 5 months ago
  48. 78c9cba Merge "Remove vold logs related to block devices" am: cbf82ffa29 am: 9bf8553f8d by Nikita Ioffe · 3 years, 5 months ago
  49. 9bf8553 Merge "Remove vold logs related to block devices" am: cbf82ffa29 by Nikita Ioffe · 3 years, 5 months ago
  50. cbf82ff Merge "Remove vold logs related to block devices" by Nikita Ioffe · 3 years, 5 months ago
  51. b881fc4 Remove vold logs related to block devices by Nikita Ioffe · 3 years, 5 months ago
  52. 973e059 Remove ndk_platform backend. Use the ndk backend. by Jiyong Park · 3 years, 5 months ago
  53. 9eedaed [automerger skipped] Add command for setting the key binding seed am: c11f7de95d -s ours by Sean Keys · 3 years, 5 months ago
  54. c11f7de Add command for setting the key binding seed by Sean Keys · 3 years, 6 months ago
  55. 879038b Merge "Add command for setting the key binding seed" am: 2d76731968 am: 7aec273c8d am: a3f7a54366 by Keith Mok · 3 years, 6 months ago
  56. a3f7a54 Merge "Add command for setting the key binding seed" am: 2d76731968 am: 7aec273c8d by Keith Mok · 3 years, 6 months ago
  57. 7aec273 Merge "Add command for setting the key binding seed" am: 2d76731968 by Keith Mok · 3 years, 6 months ago
  58. 2d76731 Merge "Add command for setting the key binding seed" by Keith Mok · 3 years, 6 months ago
  59. 8452f41 Add command for setting the key binding seed by Sean Keys · 3 years, 6 months ago
  60. ea24b87 [automerger skipped] Ignore too-early earlyBootEnded on FDE devices am: 2ddc1338d7 am: 0b26eb0701 -s ours by Eric Biggers · 3 years, 6 months ago
  61. 3777a77 [automerger skipped] Ignore too-early earlyBootEnded on FDE devices am: 2ddc1338d7 -s ours am: 3746f5a475 -s ours by Eric Biggers · 3 years, 6 months ago
  62. 0b26eb0 Ignore too-early earlyBootEnded on FDE devices am: 2ddc1338d7 by Eric Biggers · 3 years, 6 months ago
  63. 3746f5a [automerger skipped] Ignore too-early earlyBootEnded on FDE devices am: 2ddc1338d7 -s ours by Eric Biggers · 3 years, 6 months ago
  64. 4a45367 Merge "Ignore too-early earlyBootEnded on FDE devices" am: a3bd31c170 am: 979429e6c3 am: 9f749bcb19 by Eric Biggers · 3 years, 6 months ago
  65. 9f749bc Merge "Ignore too-early earlyBootEnded on FDE devices" am: a3bd31c170 am: 979429e6c3 by Eric Biggers · 3 years, 6 months ago
  66. 979429e Merge "Ignore too-early earlyBootEnded on FDE devices" am: a3bd31c170 by Eric Biggers · 3 years, 6 months ago
  67. 2ddc133 Ignore too-early earlyBootEnded on FDE devices by Eric Biggers · 3 years, 6 months ago
  68. a3bd31c Merge "Ignore too-early earlyBootEnded on FDE devices" by Eric Biggers · 3 years, 6 months ago
  69. 4859e0c Ignore too-early earlyBootEnded on FDE devices by Eric Biggers · 3 years, 6 months ago
  70. eef934f Merge "Replace writepid with task_profiles command for cgroup migration" am: 73a54f653b am: 545957abfe am: 7bff55552f by Treehugger Robot · 3 years, 6 months ago
  71. 7bff555 Merge "Replace writepid with task_profiles command for cgroup migration" am: 73a54f653b am: 545957abfe by Treehugger Robot · 3 years, 6 months ago
  72. 545957a Merge "Replace writepid with task_profiles command for cgroup migration" am: 73a54f653b by Treehugger Robot · 3 years, 6 months ago
  73. 73a54f6 Merge "Replace writepid with task_profiles command for cgroup migration" by Treehugger Robot · 3 years, 6 months ago
  74. d7d3010 Replace writepid with task_profiles command for cgroup migration by Suren Baghdasaryan · 3 years, 6 months ago
  75. 1c33372 Merge "Remove wait_for_keymaster and all references" am: a236ff87b9 am: f267642932 am: 8b6b626be7 by Paul Crowley · 3 years, 6 months ago
  76. 8b6b626 Merge "Remove wait_for_keymaster and all references" am: a236ff87b9 am: f267642932 by Paul Crowley · 3 years, 6 months ago
  77. f267642 Merge "Remove wait_for_keymaster and all references" am: a236ff87b9 by Paul Crowley · 3 years, 6 months ago
  78. a236ff8 Merge "Remove wait_for_keymaster and all references" by Paul Crowley · 3 years, 6 months ago
  79. 619bfa1 Merge "No using inside header files" am: 17e1a0919d am: 23aaf5a7a6 am: a1c6ce6f2f by Treehugger Robot · 3 years, 7 months ago
  80. a1c6ce6 Merge "No using inside header files" am: 17e1a0919d am: 23aaf5a7a6 by Treehugger Robot · 3 years, 7 months ago
  81. 23aaf5a Merge "No using inside header files" am: 17e1a0919d by Treehugger Robot · 3 years, 7 months ago
  82. 17e1a09 Merge "No using inside header files" by Treehugger Robot · 3 years, 7 months ago
  83. 604abdd Remove wait_for_keymaster and all references by Paul Crowley · 3 years, 7 months ago
  84. ef466e9 Merge "Replace most references to Keymaster with Keystore" am: ec78a94586 am: 087a2952db am: 23638cfcb3 by Eric Biggers · 3 years, 7 months ago
  85. f443038 No using inside header files by Paul Crowley · 4 years, 9 months ago
  86. 23638cf Merge "Replace most references to Keymaster with Keystore" am: ec78a94586 am: 087a2952db by Eric Biggers · 3 years, 7 months ago
  87. 087a295 Merge "Replace most references to Keymaster with Keystore" am: ec78a94586 by Eric Biggers · 3 years, 7 months ago
  88. ec78a94 Merge "Replace most references to Keymaster with Keystore" by Eric Biggers · 3 years, 7 months ago
  89. d86a8ab Replace most references to Keymaster with Keystore by Eric Biggers · 3 years, 7 months ago
  90. 68361c3 Merge "cryptfs: log beginning/end of each unmount attempt" am: e33bd41f49 am: d535dc6846 am: 148960c4da by Eric Biggers · 3 years, 7 months ago
  91. 148960c Merge "cryptfs: log beginning/end of each unmount attempt" am: e33bd41f49 am: d535dc6846 by Eric Biggers · 3 years, 7 months ago
  92. d535dc6 Merge "cryptfs: log beginning/end of each unmount attempt" am: e33bd41f49 by Eric Biggers · 3 years, 7 months ago
  93. e33bd41 Merge "cryptfs: log beginning/end of each unmount attempt" by Eric Biggers · 3 years, 7 months ago
  94. 6730161 [automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 12e48a85fb am: 35c828e5ae am: 640c6943a8 -s ours by Xin Li · 3 years, 7 months ago
  95. c8678f8 [automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 1c79e144d5 am: 0bd6aa1328 am: a63ab5e7e0 -s ours by Xin Li · 3 years, 7 months ago
  96. 640c694 Merge "DO NOT MERGE - Merge ab/7272582" am: 12e48a85fb am: 35c828e5ae by Xin Li · 3 years, 7 months ago
  97. a63ab5e DO NOT MERGE - Merge ab/7272582 am: 1c79e144d5 am: 0bd6aa1328 by Xin Li · 3 years, 7 months ago
  98. 35c828e Merge "DO NOT MERGE - Merge ab/7272582" am: 12e48a85fb by Xin Li · 3 years, 7 months ago
  99. 0bd6aa1 DO NOT MERGE - Merge ab/7272582 am: 1c79e144d5 by Xin Li · 3 years, 7 months ago
  100. 12e48a8 Merge "DO NOT MERGE - Merge ab/7272582" by Xin Li · 3 years, 7 months ago