Gitiles
Code Review Sign In
review.blissroms.org / platform_system_vold / bf5a0f78775206ecac95e426f1e67a1f9aec3d5d
commitbf5a0f78775206ecac95e426f1e67a1f9aec3d5d[log] [tgz]
authorXin Li <delphij@google.com>Tue Dec 14 22:18:41 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Dec 14 22:18:41 2021 +0000
treea1662d6253153c88ac74f95c04995605e8cfc3e3
parent95436f8eb7d7ab63f4be9bcefc3a3116e7871728 [diff]
parentdd850f5d4c0fc100baed1274e7ef939534f6a503 [diff]
[automerger skipped] Merge "Merge Android 12 QPR1" am: 235d1d65f8 -s ours am: 8f933c71e0 -s ours am: 76ff4f2267 -s ours am: dd850f5d4c -s ours

am skip reason: Merged-In Id6edfe90aadae4db1b23c5bc0de4981170ba42f2 with SHA-1 344c737ba0 is already in history

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

Change-Id: If5a40b4b1baaa94a28659032aa3aa5aa303d5ef5
tree: a1662d6253153c88ac74f95c04995605e8cfc3e3
  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. Devmapper.cpp
  21. Devmapper.h
  22. EncryptInplace.cpp
  23. EncryptInplace.h
  24. FileDeviceUtils.cpp
  25. FileDeviceUtils.h
  26. FsCrypt.cpp
  27. FsCrypt.h
  28. IdleMaint.cpp
  29. IdleMaint.h
  30. KeyBuffer.cpp
  31. KeyBuffer.h
  32. KeyStorage.cpp
  33. KeyStorage.h
  34. Keystore.cpp
  35. Keystore.h
  36. KeyUtil.cpp
  37. KeyUtil.h
  38. Loop.cpp
  39. Loop.h
  40. main.cpp
  41. MetadataCrypt.cpp
  42. MetadataCrypt.h
  43. MoveStorage.cpp
  44. MoveStorage.h
  45. NetlinkHandler.cpp
  46. NetlinkHandler.h
  47. NetlinkManager.cpp
  48. NetlinkManager.h
  49. OWNERS
  50. PREUPLOAD.cfg
  51. Process.cpp
  52. Process.h
  53. secdiscard.cpp
  54. sehandle.h
  55. TEST_MAPPING
  56. Utils.cpp
  57. Utils.h
  58. vdc.cpp
  59. vold.rc
  60. vold_prepare_subdirs.cpp
  61. VoldNativeService.cpp
  62. VoldNativeService.h
  63. VoldNativeServiceValidation.cpp
  64. VoldNativeServiceValidation.h
  65. VoldUtil.cpp
  66. VoldUtil.h
  67. VolumeManager.cpp
  68. VolumeManager.h