commit f7a0d007d23ca924b6e85d609c787f05a503f285
author Paul Crowley <paulcrowley@google.com> Mon Feb 08 22:40:34 2016 +0000
committer Paul Crowley <paulcrowley@google.com> Mon Feb 08 22:40:34 2016 +0000
tree ad33e49d5f3b92f92c8edefbb3eb5a60197dfcd8
parent 5c025bd9a54ac5f291005735f97bc66c0da98d01

Add new argument to unlock_user_key, fixing merge-caused error.

Change-Id: Ic51f375e500cd61bda926e3b039126a840ed89f0

Ext4Crypt.cpp

diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index 856a58b..b966b96 100644
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@@ -422,7 +422,7 @@
     // If this is a non-FBE device that recently left an emulated mode,
     // restore user data directories to known-good state.
     if (!e4crypt_is_native() && !e4crypt_is_emulated()) {
-        e4crypt_unlock_user_key(0, 0, nullptr);
+        e4crypt_unlock_user_key(0, 0, nullptr, nullptr);
     }
 
     return 0;