Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / adeb6833b2032ddd68d0635d3d70d0647572f3ce
commitadeb6833b2032ddd68d0635d3d70d0647572f3ce[log] [tgz]
authorXin Li <delphij@google.com>Wed Jun 26 15:22:31 2019 -0700
committerandroid-build-merger <android-build-merger@google.com>Wed Jun 26 15:22:31 2019 -0700
tree0485f9b73081f5a91757bb66a9570bf08ea6dd73
parent9bb470b33b20082e1d160299a2aaeb2394153d78 [diff]
parent009230197661eb3caa1f82e2b6b55e9deb2cde65 [diff]
[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes). am: 3601f4790b -s ours
am: 0092301976 -s ours
am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1 3d3a9a7f1c is in history

Change-Id: Ife2798dfa4052da6c8fe8512f5899efd3a11cfe8
tree: 0485f9b73081f5a91757bb66a9570bf08ea6dd73
  1. bench/
  2. binder/
  3. fs/
  4. model/
  5. tests/
  6. .clang-format
  7. Android.bp
  8. AppFuseUtil.cpp
  9. AppFuseUtil.h
  10. Benchmark.cpp
  11. Benchmark.h
  12. BenchmarkGen.h
  13. CheckEncryption.cpp
  14. CheckEncryption.h
  15. Checkpoint.cpp
  16. Checkpoint.h
  17. CleanSpec.mk
  18. cryptfs.cpp
  19. cryptfs.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. Utils.cpp
  58. Utils.h
  59. vdc.cpp
  60. vdc.rc
  61. vold.rc
  62. vold_prepare_subdirs.cpp
  63. VoldNativeService.cpp
  64. VoldNativeService.h
  65. VoldUtil.cpp
  66. VoldUtil.h
  67. VolumeManager.cpp
  68. VolumeManager.h
  69. wait_for_keymaster.cpp
  70. wait_for_keymaster.rc