Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / fcb118267c2cfeff0e69c5b1451befa6465fb472
commitfcb118267c2cfeff0e69c5b1451befa6465fb472[log] [tgz]
authorTreeHugger Robot <treehugger-gerrit@google.com>Tue Sep 15 18:37:26 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Sep 15 18:37:26 2020 +0000
treecb2762ef9c3a5db376fdccd9480c23e5c380148e
parent5a293643e8d8b8c847be7b28f1c0cda1e144797e [diff]
parenta748229c320379355fdef404e793fa7da2ed1e7d [diff]
[automerger skipped] Merge "Choose options format using property" into rvc-dev am: 0fbd0c1542 am: a46dc6fe7a am: a748229c32 -s ours

am skip reason: Change-Id Ib51071b7c316ce074de72439741087b18335048c with SHA-1 4073c0b524 is in history

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

Change-Id: I963735e2c52ef5245a597d32b47c7f8eee8f650c
tree: cb2762ef9c3a5db376fdccd9480c23e5c380148e
  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