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

Keymaster.cpp

diff --git a/Keymaster.cpp b/Keymaster.cpp
index 7119dcc..1e1ce66 100644
--- a/Keymaster.cpp
+++ b/Keymaster.cpp
@@ -278,25 +278,25 @@
 
     while (true) {
         op = dev.begin(KeyPurpose::SIGN, key, paramBuilder, &outParams);
-        if (op.error() == ErrorCode::KEY_RATE_LIMIT_EXCEEDED) {
+        if (op.errorCode() == ErrorCode::KEY_RATE_LIMIT_EXCEEDED) {
             sleep(ratelimit);
             continue;
         } else break;
     }
 
-    if (op.error() != ErrorCode::OK) {
-        LOG(ERROR) << "Error starting keymaster signature transaction: " << int32_t(op.error());
+    if (op.errorCode() != ErrorCode::OK) {
+        LOG(ERROR) << "Error starting keymaster signature transaction: " << int32_t(op.errorCode());
         return -1;
     }
 
     if (!op.updateCompletely(input, &output)) {
         LOG(ERROR) << "Error sending data to keymaster signature transaction: "
-                   << uint32_t(op.error());
+                   << uint32_t(op.errorCode());
         return -1;
     }
 
     if (!op.finish(&output)) {
-        LOG(ERROR) << "Error finalizing keymaster signature transaction: " << int32_t(op.error());
+        LOG(ERROR) << "Error finalizing keymaster signature transaction: " << int32_t(op.errorCode());
         return -1;
     }