Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / f14f8627bb30ea7d656f8a55c2aa4b3aedc48b80
commitf14f8627bb30ea7d656f8a55c2aa4b3aedc48b80[log] [tgz]
authorEric Biggers <ebiggers@google.com>Thu Mar 17 23:06:45 2022 +0000
committerEric Biggers <ebiggers@google.com>Thu Mar 17 23:17:33 2022 +0000
tree5925feea77ed2979024b72a772d8bb2765bc7f78
parente7dbc48584e7c87a5402a0cf069d333d6da32d0d [diff]
Fix check for whether metadata encryption is enabled

metadata_key_dir controls whether metadata encryption is enabled, not
metadata_encryption which is just the encryption options and can be
empty if the default options are sufficient.

Bug: 198405417
Fixes: 156d9d229378 ("Pre-create userdata metadata encryption device.")
Change-Id: I98ee253c7e5e738ee087ec07ed60f4a376ca7cee
1 file changed
tree: 5925feea77ed2979024b72a772d8bb2765bc7f78
  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. Checkpoint.cpp
  14. Checkpoint.h
  15. CleanSpec.mk
  16. cryptfs.cpp
  17. cryptfs.h
  18. CryptoType.cpp
  19. CryptoType.h
  20. EncryptInplace.cpp
  21. EncryptInplace.h
  22. FileDeviceUtils.cpp
  23. FileDeviceUtils.h
  24. FsCrypt.cpp
  25. FsCrypt.h
  26. IdleMaint.cpp
  27. IdleMaint.h
  28. KeyBuffer.cpp
  29. KeyBuffer.h
  30. KeyStorage.cpp
  31. KeyStorage.h
  32. Keystore.cpp
  33. Keystore.h
  34. KeyUtil.cpp
  35. KeyUtil.h
  36. Loop.cpp
  37. Loop.h
  38. main.cpp
  39. MetadataCrypt.cpp
  40. MetadataCrypt.h
  41. MoveStorage.cpp
  42. MoveStorage.h
  43. NetlinkHandler.cpp
  44. NetlinkHandler.h
  45. NetlinkManager.cpp
  46. NetlinkManager.h
  47. OWNERS
  48. PREUPLOAD.cfg
  49. Process.cpp
  50. Process.h
  51. secdiscard.cpp
  52. sehandle.h
  53. TEST_MAPPING
  54. Utils.cpp
  55. Utils.h
  56. vdc.cpp
  57. vold.rc
  58. vold_prepare_subdirs.cpp
  59. VoldNativeService.cpp
  60. VoldNativeService.h
  61. VoldNativeServiceValidation.cpp
  62. VoldNativeServiceValidation.h
  63. VoldUtil.cpp
  64. VoldUtil.h
  65. VolumeManager.cpp
  66. VolumeManager.h