Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 82208b730fa18a39abb19e67b4d744aecc12678c
commit82208b730fa18a39abb19e67b4d744aecc12678c[log] [tgz]
authorJeff Sharkey <jsharkey@android.com>Fri Jun 01 16:03:58 2018 -0700
committerandroid-build-merger <android-build-merger@google.com>Fri Jun 01 16:03:58 2018 -0700
tree8a70cb531f2d22ec8d39157f52dc371155f8a6a0
parentcb62773a99d282764a6bd48821d2ec7505e42e46 [diff]
parent8e7c2624bb47ae3746f4bc82f1d591dd399cab06 [diff]
[automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f am: f707f1bb88 am: 2b9a343319  -s ours
am: 8e7c2624bb

Change-Id: Id3d4b780bab0e36da7d6bb3abf932c947a8fad86
tree: 8a70cb531f2d22ec8d39157f52dc371155f8a6a0
  1. bench/
  2. binder/
  3. fs/
  4. model/
  5. tests/
  6. .clang-format
  7. Android.bp
  8. Benchmark.cpp
  9. Benchmark.h
  10. BenchmarkGen.h
  11. CheckEncryption.cpp
  12. CheckEncryption.h
  13. CleanSpec.mk
  14. cryptfs.cpp
  15. cryptfs.h
  16. Devmapper.cpp
  17. Devmapper.h
  18. EncryptInplace.cpp
  19. EncryptInplace.h
  20. Ext4Crypt.cpp
  21. Ext4Crypt.h
  22. FileDeviceUtils.cpp
  23. FileDeviceUtils.h
  24. hash.h
  25. IdleMaint.cpp
  26. IdleMaint.h
  27. KeyBuffer.cpp
  28. KeyBuffer.h
  29. Keymaster.cpp
  30. Keymaster.h
  31. KeyStorage.cpp
  32. KeyStorage.h
  33. KeyUtil.cpp
  34. KeyUtil.h
  35. Loop.cpp
  36. Loop.h
  37. main.cpp
  38. MetadataCrypt.cpp
  39. MetadataCrypt.h
  40. MoveStorage.cpp
  41. MoveStorage.h
  42. NetlinkHandler.cpp
  43. NetlinkHandler.h
  44. NetlinkManager.cpp
  45. NetlinkManager.h
  46. OWNERS
  47. PREUPLOAD.cfg
  48. Process.cpp
  49. Process.h
  50. ScryptParameters.cpp
  51. ScryptParameters.h
  52. secdiscard.cpp
  53. secontext.cpp
  54. secontext.h
  55. sehandle.h
  56. Utils.cpp
  57. Utils.h
  58. vdc.cpp
  59. vdc.rc
  60. vold.rc
  61. vold_prepare_subdirs.cpp
  62. VoldNativeService.cpp
  63. VoldNativeService.h
  64. VoldUtil.cpp
  65. VoldUtil.h
  66. VolumeManager.cpp
  67. VolumeManager.h
  68. wait_for_keymaster.cpp
  69. wait_for_keymaster.rc