Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / de83dfef5a4be11552c955917e98124ba579d39b
commitde83dfef5a4be11552c955917e98124ba579d39b[log] [tgz]
authorGreg Kaiser <gkaiser@google.com>Thu Dec 20 20:07:07 2018 -0800
committerandroid-build-merger <android-build-merger@google.com>Thu Dec 20 20:07:07 2018 -0800
tree5b06d62b6f8d6890cbdcca32efec03612172c964
parent37fd66f19db161ac8578b38c70b934ef287e0e14 [diff]
parentfc268716021c50b1c01c6a7852037af270b61ecf [diff]
[automerger skipped] Merge changes I1c50546e,I8254cb6b,Ib179299a,Iec1c2801 am: 2374693556 am: 770b2347cf
am: fc26871602  -s ours

Change-Id: I08122a7d110d1bc5a74d1cb5f629c4edbafc62d2
tree: 5b06d62b6f8d6890cbdcca32efec03612172c964
  1. bench/
  2. binder/
  3. fs/
  4. model/
  5. tests/
  6. .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. Devmapper.cpp
  21. Devmapper.h
  22. EncryptInplace.cpp
  23. EncryptInplace.h
  24. FileDeviceUtils.cpp
  25. FileDeviceUtils.h
  26. FsCrypt.cpp
  27. FsCrypt.h
  28. hash.h
  29. IdleMaint.cpp
  30. IdleMaint.h
  31. KeyBuffer.cpp
  32. KeyBuffer.h
  33. Keymaster.cpp
  34. Keymaster.h
  35. KeyStorage.cpp
  36. KeyStorage.h
  37. KeyUtil.cpp
  38. KeyUtil.h
  39. Loop.cpp
  40. Loop.h
  41. main.cpp
  42. MetadataCrypt.cpp
  43. MetadataCrypt.h
  44. MoveStorage.cpp
  45. MoveStorage.h
  46. NetlinkHandler.cpp
  47. NetlinkHandler.h
  48. NetlinkManager.cpp
  49. NetlinkManager.h
  50. OWNERS
  51. PREUPLOAD.cfg
  52. Process.cpp
  53. Process.h
  54. ScryptParameters.cpp
  55. ScryptParameters.h
  56. secdiscard.cpp
  57. secontext.cpp
  58. secontext.h
  59. sehandle.h
  60. Utils.cpp
  61. Utils.h
  62. vdc.cpp
  63. vdc.rc
  64. vold.rc
  65. vold_prepare_subdirs.cpp
  66. VoldNativeService.cpp
  67. VoldNativeService.h
  68. VoldUtil.cpp
  69. VoldUtil.h
  70. VolumeManager.cpp
  71. VolumeManager.h
  72. wait_for_keymaster.cpp
  73. wait_for_keymaster.rc