Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / ddbd8325f53a29200d512e018d0a456cb0942ead
commitddbd8325f53a29200d512e018d0a456cb0942ead[log] [tgz]
authorEric Biggers <ebiggers@google.com>Mon Oct 29 17:19:39 2018 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>Mon Oct 29 17:19:39 2018 +0000
tree5dd2abe8b4b139cc049661b27fa00d8abf594c2b
parent0016efbc446910650cc041194621cc8f9ba04151 [diff]
parentba997ee583d926aafb08bdc97d1e5a352eb51481 [diff]
Merge changes from topic "e4crypt_to_fscrypt"

* changes:
  vold: get the fscrypt kernel API declarations from linux/fs.h
  vold: rename from "ext4 encryption" to fscrypt
tree: 5dd2abe8b4b139cc049661b27fa00d8abf594c2b
  1. bench/
  2. binder/
  3. fs/
  4. model/
  5. tests/
  6. .clang-format
  7. Android.bp
  8. Benchmark.cpp
  9. Benchmark.h
  10. BenchmarkGen.h
  11. CheckEncryption.cpp
  12. CheckEncryption.h
  13. Checkpoint.cpp
  14. Checkpoint.h
  15. CleanSpec.mk
  16. cryptfs.cpp
  17. cryptfs.h
  18. Devmapper.cpp
  19. Devmapper.h
  20. EncryptInplace.cpp
  21. EncryptInplace.h
  22. FileDeviceUtils.cpp
  23. FileDeviceUtils.h
  24. FsCrypt.cpp
  25. FsCrypt.h
  26. hash.h
  27. IdleMaint.cpp
  28. IdleMaint.h
  29. KeyBuffer.cpp
  30. KeyBuffer.h
  31. Keymaster.cpp
  32. Keymaster.h
  33. KeyStorage.cpp
  34. KeyStorage.h
  35. KeyUtil.cpp
  36. KeyUtil.h
  37. Loop.cpp
  38. Loop.h
  39. main.cpp
  40. MetadataCrypt.cpp
  41. MetadataCrypt.h
  42. MoveStorage.cpp
  43. MoveStorage.h
  44. NetlinkHandler.cpp
  45. NetlinkHandler.h
  46. NetlinkManager.cpp
  47. NetlinkManager.h
  48. OWNERS
  49. PREUPLOAD.cfg
  50. Process.cpp
  51. Process.h
  52. ScryptParameters.cpp
  53. ScryptParameters.h
  54. secdiscard.cpp
  55. secontext.cpp
  56. secontext.h
  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