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
diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index d8832d3..0053478 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -302,12 +302,14 @@
}
}
-binder::Status VoldNativeService::forgetPartition(const std::string& partGuid) {
+binder::Status VoldNativeService::forgetPartition(const std::string& partGuid,
+ const std::string& fsUuid) {
ENFORCE_UID(AID_SYSTEM);
CHECK_ARGUMENT_HEX(partGuid);
+ CHECK_ARGUMENT_HEX(fsUuid);
ACQUIRE_LOCK;
- return translate(VolumeManager::Instance()->forgetPartition(partGuid));
+ return translate(VolumeManager::Instance()->forgetPartition(partGuid, fsUuid));
}
binder::Status VoldNativeService::mount(const std::string& volId, int32_t mountFlags,