Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / b0519d0d1ea5dc58ce3a8aa3951e686ad6122c27
commitb0519d0d1ea5dc58ce3a8aa3951e686ad6122c27[log] [tgz]
authorPaul Crowley <paulcrowley@google.com>Fri Aug 13 21:33:58 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Aug 13 21:33:58 2021 +0000
tree3aeb8f8e227c527d632583fff1cadf78f932191f
parent74547c3e5598fe534801280a18786593b651be54 [diff]
parent82daf3dcad65d7c83cc035b7ecc4871a82bca151 [diff]
[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

am skip reason: skipped by user paulcrowley

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15547746

Change-Id: I3fae550d5a025f92cccf1c3761c7f57d4db62b92
tree: 3aeb8f8e227c527d632583fff1cadf78f932191f
  1. bench/
  2. binder/
  3. fs/
  4. model/
  5. tests/
  6. .clang-format ⇨ ../../build/soong/scripts/system-clang-format
  7. Android.bp
  8. AppFuseUtil.cpp
  9. AppFuseUtil.h
  10. Benchmark.cpp
  11. Benchmark.h
  12. BenchmarkGen.h
  13. Checkpoint.cpp
  14. Checkpoint.h
  15. CleanSpec.mk
  16. cryptfs.cpp
  17. cryptfs.h
  18. CryptoType.cpp
  19. CryptoType.h
  20. Devmapper.cpp
  21. Devmapper.h
  22. EncryptInplace.cpp
  23. EncryptInplace.h
  24. FileDeviceUtils.cpp
  25. FileDeviceUtils.h
  26. FsCrypt.cpp
  27. FsCrypt.h
  28. IdleMaint.cpp
  29. IdleMaint.h
  30. KeyBuffer.cpp
  31. KeyBuffer.h
  32. KeyStorage.cpp
  33. KeyStorage.h
  34. Keystore.cpp
  35. Keystore.h
  36. KeyUtil.cpp
  37. KeyUtil.h
  38. Loop.cpp
  39. Loop.h
  40. main.cpp
  41. MetadataCrypt.cpp
  42. MetadataCrypt.h
  43. MoveStorage.cpp
  44. MoveStorage.h
  45. NetlinkHandler.cpp
  46. NetlinkHandler.h
  47. NetlinkManager.cpp
  48. NetlinkManager.h
  49. OWNERS
  50. PREUPLOAD.cfg
  51. Process.cpp
  52. Process.h
  53. ScryptParameters.cpp
  54. ScryptParameters.h
  55. secdiscard.cpp
  56. sehandle.h
  57. TEST_MAPPING
  58. Utils.cpp
  59. Utils.h
  60. vdc.cpp
  61. vdc.rc
  62. vold.rc
  63. vold_prepare_subdirs.cpp
  64. VoldNativeService.cpp
  65. VoldNativeService.h
  66. VoldNativeServiceValidation.cpp
  67. VoldNativeServiceValidation.h
  68. VoldUtil.cpp
  69. VoldUtil.h
  70. VolumeManager.cpp
  71. VolumeManager.h