Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / e3f78f484335a04f19577fa454cc1f37ef20ab07
commite3f78f484335a04f19577fa454cc1f37ef20ab07[log] [tgz]
authorPaul Crowley <paulcrowley@google.com>Sun Feb 16 07:37:18 2020 -0800
committerPaul Crowley <paulcrowley@google.com>Sun Feb 16 07:37:18 2020 -0800
treeba7e4ef76cfc34d6e0daa4390a826be0b8bfc71f
parentb3d018a62c35d34991332dfaa678d61e97f3e1d2 [diff]
parentbdd9fbf9dbda429393ee0d86a74c71fdfbaa6a19 [diff]
resolve merge conflicts of bdd9fbf9dbda429393ee0d86a74c71fdfbaa6a19 to master

Bug: None
Test: Treehugger
Change-Id: I17a300687bc7f56feb79b820b7196b2a9124c5f4
tree: ba7e4ef76cfc34d6e0daa4390a826be0b8bfc71f
  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. VoldUtil.cpp
  70. VoldUtil.h
  71. VolumeManager.cpp
  72. VolumeManager.h
  73. wait_for_keymaster.cpp
  74. wait_for_keymaster.rc