Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 071120776a023a726dbdcb2ca6fa5293367f0281
commit071120776a023a726dbdcb2ca6fa5293367f0281[log] [tgz]
authorPaul Crowley <paulcrowley@google.com>Wed Jun 28 16:08:04 2017 -0700
committerPaul Crowley <paulcrowley@google.com>Wed Jun 28 16:09:00 2017 -0700
treef06d811d47b6c0038eac5a16f143faa56d9a12c8
parentbd40570e257a05b6c197241a52ff1194ffde0ff7 [diff]
parent8e6f6a5cebf023905b37b0fc80d3ceec262a0d91 [diff]
resolve merge conflicts of 8e6f6a5 to oc-dr1-dev-plus-aosp

Test: None
Change-Id: Icf7654b3200a4afd104f31aff8ce5b09867b7182
tree: f06d811d47b6c0038eac5a16f143faa56d9a12c8
  1. bench/
  2. fs/
  3. tests/
  4. Android.mk
  5. Asec.h
  6. AutoCloseFD.h
  7. Benchmark.cpp
  8. Benchmark.h
  9. BenchmarkGen.h
  10. CheckBattery.cpp
  11. CheckBattery.h
  12. CleanSpec.mk
  13. CommandListener.cpp
  14. CommandListener.h
  15. CryptCommandListener.cpp
  16. CryptCommandListener.h
  17. cryptfs.cpp
  18. cryptfs.h
  19. Devmapper.cpp
  20. Devmapper.h
  21. Disk.cpp
  22. Disk.h
  23. EmulatedVolume.cpp
  24. EmulatedVolume.h
  25. EncryptInplace.cpp
  26. EncryptInplace.h
  27. Ext4Crypt.cpp
  28. Ext4Crypt.h
  29. hash.h
  30. Keymaster.cpp
  31. Keymaster.h
  32. KeyStorage.cpp
  33. KeyStorage.h
  34. KeyUtil.cpp
  35. KeyUtil.h
  36. Loop.cpp
  37. Loop.h
  38. main.cpp
  39. MetadataCrypt.cpp
  40. MetadataCrypt.h
  41. MoveTask.cpp
  42. MoveTask.h
  43. NetlinkHandler.cpp
  44. NetlinkHandler.h
  45. NetlinkManager.cpp
  46. NetlinkManager.h
  47. OWNERS
  48. PrivateVolume.cpp
  49. PrivateVolume.h
  50. Process.cpp
  51. Process.h
  52. PublicVolume.cpp
  53. PublicVolume.h
  54. ResponseCode.cpp
  55. ResponseCode.h
  56. ScryptParameters.cpp
  57. ScryptParameters.h
  58. secdiscard.cpp
  59. secontext.cpp
  60. secontext.h
  61. sehandle.h
  62. TrimTask.cpp
  63. TrimTask.h
  64. Utils.cpp
  65. Utils.h
  66. vdc.cpp
  67. vdc.rc
  68. vold.rc
  69. VoldCommand.cpp
  70. VoldCommand.h
  71. VoldUtil.c
  72. VoldUtil.h
  73. VolumeBase.cpp
  74. VolumeBase.h
  75. VolumeManager.cpp
  76. VolumeManager.h