Gitiles
Code Review Sign In
android-review.linaro.org / platform / system / vold / fc9a8495be7fd29b64846f2911fdfdaf96b8f4cb
commitfc9a8495be7fd29b64846f2911fdfdaf96b8f4cb[log] [tgz]
authorEric Biggers <ebiggers@google.com>Sat Oct 07 00:58:15 2023 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Sat Oct 07 00:58:15 2023 +0000
tree956e709094261ff8257d6983d335355bac1ceab2
parent83d9bce47f9dba3ac843ddb42e931c1e7990bec9 [diff]
parentc6fa21391c98271e524270735f2a8119bd6d1b72 [diff]
[automerger skipped] Merge changes If530edaf,I7f11a135,I28412f24,Ia27a61fa,If221e239 into main am: f15785a54d am: 56e7c29466 am: 24a5445880 am: 1a2598d77d am: c6fa21391c -s ours

am skip reason: Merged-In If530edaf7c1566dd3bd8b1322f935f38a2e66beb with SHA-1 2b97a88ba4 is already in history

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

Change-Id: I05969a9df342d2d617241579977b3ee52c371199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 956e709094261ff8257d6983d335355bac1ceab2
  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. Checkpoint.cpp
  14. Checkpoint.h
  15. CleanSpec.mk
  16. cryptfs.cpp
  17. cryptfs.h
  18. CryptoType.cpp
  19. CryptoType.h
  20. EncryptInplace.cpp
  21. EncryptInplace.h
  22. FileDeviceUtils.cpp
  23. FileDeviceUtils.h
  24. FsCrypt.cpp
  25. FsCrypt.h
  26. IdleMaint.cpp
  27. IdleMaint.h
  28. KeyBuffer.cpp
  29. KeyBuffer.h
  30. KeyStorage.cpp
  31. KeyStorage.h
  32. Keystore.cpp
  33. Keystore.h
  34. KeyUtil.cpp
  35. KeyUtil.h
  36. Loop.cpp
  37. Loop.h
  38. main.cpp
  39. MetadataCrypt.cpp
  40. MetadataCrypt.h
  41. MoveStorage.cpp
  42. MoveStorage.h
  43. NetlinkHandler.cpp
  44. NetlinkHandler.h
  45. NetlinkManager.cpp
  46. NetlinkManager.h
  47. OWNERS
  48. PREUPLOAD.cfg
  49. Process.cpp
  50. Process.h
  51. secdiscard.cpp
  52. sehandle.h
  53. TEST_MAPPING
  54. Utils.cpp
  55. Utils.h
  56. vdc.cpp
  57. vold.rc
  58. vold_prepare_subdirs.cpp
  59. VoldNativeService.cpp
  60. VoldNativeService.h
  61. VoldNativeServiceValidation.cpp
  62. VoldNativeServiceValidation.h
  63. VoldUtil.cpp
  64. VoldUtil.h
  65. VolumeManager.cpp
  66. VolumeManager.h