Gitiles
Code Review Sign In
review.blissroms.org / platform_system_vold / 6f136e8423c9aeb34b5c2b4fcbc62deb76439976
commit6f136e8423c9aeb34b5c2b4fcbc62deb76439976[log] [tgz]
authorPaul Lawrence <paullawrence@google.com>Tue Apr 19 14:52:42 2016 +0000
committerandroid-build-merger <android-build-merger@google.com>Tue Apr 19 14:52:42 2016 +0000
treeb61bd2c1ff09e3b02e5ad44f8dbd7f098da613bf
parent85dfdb082d87e2e17e69cc74d5b773959b15645c [diff]
parentc771d2086043d7b7d665a18b003937b1e142b7f0 [diff]
Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f
am: c771d20

* commit 'c771d2086043d7b7d665a18b003937b1e142b7f0':

Change-Id: Iabd62fdefbf3ea43833bc2fdb9364d51a5bba779
tree: b61bd2c1ff09e3b02e5ad44f8dbd7f098da613bf
  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.c
  18. cryptfs.h
  19. Devmapper.cpp
  20. Devmapper.h
  21. Disk.cpp
  22. Disk.h
  23. EmulatedVolume.cpp
  24. EmulatedVolume.h
  25. Ext4Crypt.cpp
  26. Ext4Crypt.h
  27. hash.h
  28. Keymaster.cpp
  29. Keymaster.h
  30. KeyStorage.cpp
  31. KeyStorage.h
  32. Loop.cpp
  33. Loop.h
  34. main.cpp
  35. MoveTask.cpp
  36. MoveTask.h
  37. NetlinkHandler.cpp
  38. NetlinkHandler.h
  39. NetlinkManager.cpp
  40. NetlinkManager.h
  41. PrivateVolume.cpp
  42. PrivateVolume.h
  43. Process.cpp
  44. Process.h
  45. PublicVolume.cpp
  46. PublicVolume.h
  47. ResponseCode.cpp
  48. ResponseCode.h
  49. ScryptParameters.cpp
  50. ScryptParameters.h
  51. secdiscard.cpp
  52. secontext.cpp
  53. secontext.h
  54. sehandle.h
  55. TrimTask.cpp
  56. TrimTask.h
  57. Utils.cpp
  58. Utils.h
  59. vdc.cpp
  60. vdc.rc
  61. vold.rc
  62. VoldCommand.cpp
  63. VoldCommand.h
  64. VoldUtil.c
  65. VoldUtil.h
  66. VolumeBase.cpp
  67. VolumeBase.h
  68. VolumeManager.cpp
  69. VolumeManager.h