Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / a69c584aaa62eb4e674dd38a36aa78f5bc7bda52
commita69c584aaa62eb4e674dd38a36aa78f5bc7bda52[log] [tgz]
authorXin Li <delphij@google.com>Sat Oct 26 23:48:03 2019 -0700
committerandroid-build-merger <android-build-merger@google.com>Sat Oct 26 23:48:03 2019 -0700
tree61b7ce20c5a3e8866342b3054f3a030ce1e88c70
parentb462c16fb6be42aa323543c9cc4e1f495779fd30 [diff]
parentc21f19338e1fb0c2105bb147d2b18f39b2616770 [diff]
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s ours
am: c21f19338e -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: I520c3ad27bc01eef706f411e064584dcf6268ba3
tree: 61b7ce20c5a3e8866342b3054f3a030ce1e88c70
  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