vold: Bring in more wrapped key changes
Conflicts:
KeyStorage.cpp
KeyUtil.cpp
[wight554: Apply changes from CAF 12]
Change-Id: I44e81afaec78c567a0bf2eed30a79eb737e2a867
Signed-off-by: Volodymyr Zhdanov <wight554@gmail.com>
diff --git a/FsCrypt.cpp b/FsCrypt.cpp
index 2be685f..61f62cd 100644
--- a/FsCrypt.cpp
+++ b/FsCrypt.cpp
@@ -278,6 +278,10 @@
"this flag from the device's fstab";
return false;
}
+ if (s_data_options.version == 1) {
+ s_data_options.use_hw_wrapped_key =
+ GetEntryForMountPoint(&fstab_default, DATA_MNT_POINT)->fs_mgr_flags.wrapped_key;
+ }
return true;
}