Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / 3ce18256a1e2edf830830f066e5ddb4c8203111b
commit3ce18256a1e2edf830830f066e5ddb4c8203111b[log] [tgz]
authorJeff Sharkey <jsharkey@android.com>Tue Oct 24 11:08:45 2017 -0600
committerJeff Sharkey <jsharkey@android.com>Tue Oct 24 12:19:47 2017 -0600
tree4015d01f68255d4f03589bb88987c15cdf1234c9
parentac46172c79bae9fe52f15fc0f0867c2e904cb10e [diff]
Pass both partition GUID and filesystem UUID.

FDE keys are indexed using the partition GUID, while FBE keys will be
indexed using the filesystem UUID, so pass both of those identifiers
along when forgetting a volume.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Bug: 25861755
Change-Id: I6e239d5ba67a01c9a848d705f6167da00f975924
5 files changed
tree: 4015d01f68255d4f03589bb88987c15cdf1234c9
  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. CleanSpec.mk
  12. cryptfs.cpp
  13. cryptfs.h
  14. Devmapper.cpp
  15. Devmapper.h
  16. EncryptInplace.cpp
  17. EncryptInplace.h
  18. Ext4Crypt.cpp
  19. Ext4Crypt.h
  20. FileDeviceUtils.cpp
  21. FileDeviceUtils.h
  22. hash.h
  23. IdleMaint.cpp
  24. IdleMaint.h
  25. KeyBuffer.cpp
  26. KeyBuffer.h
  27. Keymaster.cpp
  28. Keymaster.h
  29. KeyStorage.cpp
  30. KeyStorage.h
  31. KeyUtil.cpp
  32. KeyUtil.h
  33. Loop.cpp
  34. Loop.h
  35. main.cpp
  36. MetadataCrypt.cpp
  37. MetadataCrypt.h
  38. MoveStorage.cpp
  39. MoveStorage.h
  40. NetlinkHandler.cpp
  41. NetlinkHandler.h
  42. NetlinkManager.cpp
  43. NetlinkManager.h
  44. OWNERS
  45. prepare_dir.cpp
  46. PREUPLOAD.cfg
  47. Process.cpp
  48. Process.h
  49. ScryptParameters.cpp
  50. ScryptParameters.h
  51. secdiscard.cpp
  52. secontext.cpp
  53. secontext.h
  54. sehandle.h
  55. Utils.cpp
  56. Utils.h
  57. vdc.cpp
  58. vdc.rc
  59. vold.rc
  60. vold_prepare_subdirs
  61. VoldNativeService.cpp
  62. VoldNativeService.h
  63. VoldUtil.cpp
  64. VoldUtil.h
  65. VolumeManager.cpp
  66. VolumeManager.h