Gitiles
Code Review Sign In
review.blissroms.org / platform_system_vold / c17827b0956935bda96ed58ce19a1d8141924746
commitc17827b0956935bda96ed58ce19a1d8141924746[log] [tgz]
authorPaul Crowley <paulcrowley@google.com>Tue Oct 29 02:00:36 2019 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>Tue Oct 29 02:00:36 2019 +0000
tree474c2331062fd8b235be048a0e04f7ff0eb96900
parentf37dff724b4dd4a9d2bd2b77ae89f19fa3e7b544 [diff]
parenta50f6c3c2cd5f566b0969e7c8c8a023f96e95b6a [diff]
Merge changes from topics "fscrypt-options", "fstab-options"

* changes:
  Use new encryption_options fstab entry
  Replace "flags" property with "options" with same format as fstab
tree: 474c2331062fd8b235be048a0e04f7ff0eb96900
  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. 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. fscrypt_uapi.h
  29. IdleMaint.cpp
  30. IdleMaint.h
  31. KeyBuffer.cpp
  32. KeyBuffer.h
  33. Keymaster.cpp
  34. Keymaster.h
  35. KeyStorage.cpp
  36. KeyStorage.h
  37. KeyUtil.cpp
  38. KeyUtil.h
  39. Loop.cpp
  40. Loop.h
  41. main.cpp
  42. MetadataCrypt.cpp
  43. MetadataCrypt.h
  44. MoveStorage.cpp
  45. MoveStorage.h
  46. NetlinkHandler.cpp
  47. NetlinkHandler.h
  48. NetlinkManager.cpp
  49. NetlinkManager.h
  50. OWNERS
  51. PREUPLOAD.cfg
  52. Process.cpp
  53. Process.h
  54. ScryptParameters.cpp
  55. ScryptParameters.h
  56. secdiscard.cpp
  57. sehandle.h
  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. VoldUtil.cpp
  67. VoldUtil.h
  68. VolumeManager.cpp
  69. VolumeManager.h
  70. wait_for_keymaster.cpp
  71. wait_for_keymaster.rc