commit 3ce18256a1e2edf830830f066e5ddb4c8203111b
author Jeff Sharkey <jsharkey@android.com> Tue Oct 24 11:08:45 2017 -0600
committer Jeff Sharkey <jsharkey@android.com> Tue Oct 24 12:19:47 2017 -0600
tree 4015d01f68255d4f03589bb88987c15cdf1234c9
parent ac46172c79bae9fe52f15fc0f0867c2e904cb10e

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

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index befb54d..3194e59 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -293,7 +293,7 @@
     }
 }
 
-int VolumeManager::forgetPartition(const std::string& partGuid) {
+int VolumeManager::forgetPartition(const std::string& partGuid, const std::string& fsUuid) {
     std::string normalizedGuid;
     if (android::vold::NormalizeHex(partGuid, normalizedGuid)) {
         LOG(WARNING) << "Invalid GUID " << partGuid;