Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / c6717310750c1cdd4fbde2479e0966a6c444022f
commitc6717310750c1cdd4fbde2479e0966a6c444022f[log] [tgz]
authorAlistair Delva <adelva@google.com>Tue May 19 15:49:26 2020 -0700
committerAlistair Delva <adelva@google.com>Tue May 19 17:42:20 2020 -0700
tree3ca0446be939d9c59509b105037a3e0164ef338b
parentff1fc9bc417c8a4b6bffb2b12ab69a705676c17a [diff]
Handle virtio in private fs mapping

When the vold core decides if a device is SD or USB, it checks for MMC
or virtio, however when the filesystem type is decided, it does not
check for virtio, only MMC. This causes virtio SD cards to be formatted
with ext4 unconditionally.

This fix is independently correct, but it incidentally gets adopted
storage working on cuttlefish (and Android Emulator) because f2fs can
support fscrypt and casefolding at the same time; ext4 currently cannot.

Bug: 156286088
Change-Id: I0b41670d5f76b2506dad437917c2276f8e0aaccf
1 file changed
tree: 3ca0446be939d9c59509b105037a3e0164ef338b
  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. VoldNativeServiceValidation.cpp
  70. VoldNativeServiceValidation.h
  71. VoldUtil.cpp
  72. VoldUtil.h
  73. VolumeManager.cpp
  74. VolumeManager.h
  75. wait_for_keymaster.cpp
  76. wait_for_keymaster.rc