Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / a438b2436886a9d1dbb865c891cc5ec9ececba09
commita438b2436886a9d1dbb865c891cc5ec9ececba09[log] [tgz]
authorZim <zezeozue@google.com>Wed Sep 25 14:37:38 2019 +0100
committerZim <zezeozue@google.com>Mon Nov 11 20:24:49 2019 +0000
tree8717e9a392b74e108a7195467b0bd7ee90ba4714
parent0ddfc941b854cb59472bb4420c1fe22d2dba1c87 [diff]
Fix multi-user and multi-storage with FUSE

Up until now, the FUSE mount logic has made two assumptions:
1. The primary external volume is an emulated volume on /data/media
2. Only the primary user is running, as user zero

These assumptions are fixed by the following changes
creating an EmulatedVolume per Android user and changing the
VolumeBase id format to append the user to the id, so
s/emulated/emulated-0/. This allows us mount separate volumes per user

Some additional refactorings to re-use/clean up code.

Test: adb shell sm set-virtual-disk and partition disk operations work
even after setting up a work profile
Bug: 135341433

Change-Id: Ifabaa12368e5a591fbcdce4ee71c83ff35fdac6b
13 files changed
tree: 8717e9a392b74e108a7195467b0bd7ee90ba4714
  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. Devmapper.cpp
  21. Devmapper.h
  22. EncryptInplace.cpp
  23. EncryptInplace.h
  24. FileDeviceUtils.cpp
  25. FileDeviceUtils.h
  26. FsCrypt.cpp
  27. FsCrypt.h
  28. fscrypt_uapi.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. sehandle.h
  58. Utils.cpp
  59. Utils.h
  60. vdc.cpp
  61. vdc.rc
  62. vold.rc
  63. vold_prepare_subdirs.cpp
  64. VoldNativeService.cpp
  65. VoldNativeService.h
  66. VoldUtil.cpp
  67. VoldUtil.h
  68. VolumeManager.cpp
  69. VolumeManager.h
  70. wait_for_keymaster.cpp
  71. wait_for_keymaster.rc