Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 2af48151887c62ebb62835a6def80412b90b7c27
commit2af48151887c62ebb62835a6def80412b90b7c27[log] [tgz]
authorTreehugger Robot <treehugger-gerrit@google.com>Tue Jun 02 19:46:48 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Jun 02 19:46:48 2020 +0000
tree3f77de71d17cc117a67a9898fb18f4fe58220300
parentf31dd99eaeda4a561bc5566b6f1ad32897ba462e [diff]
parent3727ec993e610367a14e9fdd888824bfe1f801e4 [diff]
[automerger skipped] Merge "Record use of metadata encryption in property" am: f20a16575f am: d49f8c9eb7 -s ours am: 3727ec993e -s ours

am skip reason: Change-Id I400873ec207cb63f0407fefc83962bb3a927e294 with SHA-1 94abae03a9 is in history

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

Change-Id: I11151df4da7c1573cc7cb6fe63bb44480b80bf9c
tree: 3f77de71d17cc117a67a9898fb18f4fe58220300
  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. CryptoType.cpp
  21. CryptoType.h
  22. Devmapper.cpp
  23. Devmapper.h
  24. EncryptInplace.cpp
  25. EncryptInplace.h
  26. FileDeviceUtils.cpp
  27. FileDeviceUtils.h
  28. FsCrypt.cpp
  29. FsCrypt.h
  30. fscrypt_uapi.h
  31. IdleMaint.cpp
  32. IdleMaint.h
  33. KeyBuffer.cpp
  34. KeyBuffer.h
  35. Keymaster.cpp
  36. Keymaster.h
  37. KeyStorage.cpp
  38. KeyStorage.h
  39. KeyUtil.cpp
  40. KeyUtil.h
  41. Loop.cpp
  42. Loop.h
  43. main.cpp
  44. MetadataCrypt.cpp
  45. MetadataCrypt.h
  46. MoveStorage.cpp
  47. MoveStorage.h
  48. NetlinkHandler.cpp
  49. NetlinkHandler.h
  50. NetlinkManager.cpp
  51. NetlinkManager.h
  52. OWNERS
  53. PREUPLOAD.cfg
  54. Process.cpp
  55. Process.h
  56. ScryptParameters.cpp
  57. ScryptParameters.h
  58. secdiscard.cpp
  59. sehandle.h
  60. TEST_MAPPING
  61. Utils.cpp
  62. Utils.h
  63. vdc.cpp
  64. vdc.rc
  65. vold.rc
  66. vold_prepare_subdirs.cpp
  67. VoldNativeService.cpp
  68. VoldNativeService.h
  69. VoldNativeServiceValidation.cpp
  70. VoldNativeServiceValidation.h
  71. VoldUtil.cpp
  72. VoldUtil.h
  73. VolumeManager.cpp
  74. VolumeManager.h
  75. wait_for_keymaster.cpp
  76. wait_for_keymaster.rc