Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 673016129a3cadb5859e73e0f5ac64aa339dc218
commit673016129a3cadb5859e73e0f5ac64aa339dc218[log] [tgz]
authorXin Li <delphij@google.com>Mon Jun 14 03:47:46 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Jun 14 03:47:46 2021 +0000
tree5d7913d517d7ca1f414ad43ecd47628d976d3688
parentc8678f8ce560966e4e3172e2014daa2af0e880c0 [diff]
parent640c6943a86275eb48092019de3ba420f10be316 [diff]
[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 12e48a85fb am: 35c828e5ae am: 640c6943a8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I842ba6c219a4ea07646591c52f92333c2d0265c4
tree: 5d7913d517d7ca1f414ad43ecd47628d976d3688
  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. Keymaster.cpp
  33. Keymaster.h
  34. KeyStorage.cpp
  35. KeyStorage.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
  72. wait_for_keymaster.cpp
  73. wait_for_keymaster.rc