commit c3a1856bbe2e39d5b3430f5f088b12fd710a159f
author Chad Brubaker <cbrubaker@google.com> Tue Mar 17 18:21:35 2015 -0700
committer Chad Brubaker <cbrubaker@google.com> Fri Mar 20 12:36:42 2015 -0700
tree d53948947440f02e8f6f29c3ccf0d0099c6b4c7b
parent 9aec38fb083ae9013aab629bd8eef5f62ed749a1

Include operation handle in OperationResult

Some authorization code needs to know the actual underlying operation
handle, not simply a reference to it, so return it in case it is needed.
Note that the handle cannot be used by the application to reference an
operation.

Change-Id: I4c883dde17168b7f6c1643d81741a4c2686d3159

keystore/IKeystoreService.cpp

diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp
index 53e4e31..adde6b2 100644
--- a/keystore/IKeystoreService.cpp
+++ b/keystore/IKeystoreService.cpp
@@ -47,7 +47,7 @@
     return mSize;
 }
 
-OperationResult::OperationResult() : resultCode(0), token(), inputConsumed(0),
+OperationResult::OperationResult() : resultCode(0), token(), handle(0), inputConsumed(0),
     data(NULL), dataLength(0) {
 }
 
@@ -57,6 +57,7 @@
 void OperationResult::readFromParcel(const Parcel& in) {
     resultCode = in.readInt32();
     token = in.readStrongBinder();
+    handle = static_cast<keymaster_operation_handle_t>(in.readInt64());
     inputConsumed = in.readInt32();
     ssize_t length = in.readInt32();
     dataLength = 0;
@@ -79,6 +80,7 @@
 void OperationResult::writeToParcel(Parcel* out) const {
     out->writeInt32(resultCode);
     out->writeStrongBinder(token);
+    out->writeInt64(handle);
     out->writeInt32(inputConsumed);
     out->writeInt32(dataLength);
     if (dataLength && data) {