commit 4375f1be4ccdbf78ef4c5ab926d3316503a7b146
author Wei Wang <wvw@google.com> Fri Feb 24 17:43:01 2017 -0800
committer Wei Wang <wvw@google.com> Fri Feb 24 17:47:53 2017 -0800
tree 4702912c4333948bd201a8063882fd7c5d9cb2c1
parent d21cde6435de41c5e4e2d4cb0ffaf17155c57b0f

Change to use new WaitForProperty API

Change to use WaitForProperty API to wait for vold.post_fs_data_done
Also change cryptfs to C++

Bug: 35425974
Test: mma, marlin/angler boot

Change-Id: Id821f2035788fcc91909f296c83c871c67571de3

KeyStorage.cpp

diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index 9a1304c..34dd6c0 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -175,7 +175,7 @@
         if (opHandle) {
             return opHandle;
         }
-        if (opHandle.error() != ErrorCode::KEY_REQUIRES_UPGRADE) return opHandle;
+        if (opHandle.errorCode() != ErrorCode::KEY_REQUIRES_UPGRADE) return opHandle;
         LOG(DEBUG) << "Upgrading key: " << dir;
         std::string newKey;
         if (!keymaster.upgradeKey(kmKey, keyParams, &newKey)) return KeymasterOperation();