Gitiles
Code Review Sign In
gerrit.omnirom.org / android_system_vold / 03d5991abc10576d7a4e85ec339305805e1068ef
commit03d5991abc10576d7a4e85ec339305805e1068ef[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Mar 11 20:30:41 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Mar 11 20:30:41 2020 +0000
treeb69389647ae7fdbfddf2a1f235c7c9e013060eb0
parent369c24a7516984e7ad4d4787028d58d698acbfa2 [diff]
parent91ba0c8fa4ee0b610a0859ec0d1163cd12f4e9eb [diff]
[automerger skipped] Merge "fskeyring & userspace reboot: support CE keys" am: eaa3443ad8 am: 91ba0c8fa4 -s ours

am skip reason: Change-Id I37603dc136c7ededc7b0381e4d730cb0ffd912b4 with SHA-1 1ee35cf002 is in history

Change-Id: Idf341b045a9cebb52431265832821cf40f99cd26
tree: b69389647ae7fdbfddf2a1f235c7c9e013060eb0
  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. VoldUtil.cpp
  70. VoldUtil.h
  71. VolumeManager.cpp
  72. VolumeManager.h
  73. wait_for_keymaster.cpp
  74. wait_for_keymaster.rc