Gitiles
Code Review Sign In
gerrit.omnirom.org / android_system_vold / 3fae96b70ba2b6d6fa3dd392194179d0b4e1c1e1
commit3fae96b70ba2b6d6fa3dd392194179d0b4e1c1e1[log] [tgz]
authorXin Li <delphij@google.com>Wed Aug 17 00:26:13 2022 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Aug 17 00:26:13 2022 +0000
treeb00ef34a3ca433dbeb39529ffe7027385f4c2406
parent169df91cca06ea3fe675125a556425a712cadf81 [diff]
parentdadfcc26b917eb9f643a00a553ac0a1849ee28ed [diff]
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 3f658163ee -s ours am: e23109dbf7 -s ours am: dadfcc26b9 -s ours

am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I7876d4bf00b328961ea1f40dfdc1d7d745599485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: b00ef34a3ca433dbeb39529ffe7027385f4c2406
  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