commit 0831dea51ec950df5ecc9a76480abbe646a43110
author Chad Brubaker <cbrubaker@google.com> Thu Mar 05 19:34:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 05 19:34:49 2015 +0000
tree 0a2e2c2913edacf133cba857e9e948e294bea224
parent d30325ba99db9dfb22fc03954e40deda1e35cd6d
parent dfe0a1a5e0b37c3a327b90cbf971a3782ab16fd3

am dfe0a1a5: am d7d51a60: Merge "Revert "Remove incorrect return value read""

* commit 'dfe0a1a5e0b37c3a327b90cbf971a3782ab16fd3':
  Revert "Remove incorrect return value read"

keystore/IKeystoreService.cpp

diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp
index 79edd42..b4e35ab 100644
--- a/keystore/IKeystoreService.cpp
+++ b/keystore/IKeystoreService.cpp
@@ -1077,6 +1077,7 @@
             return;
         }
         int32_t err = reply.readExceptionCode();
+        int32_t ret = reply.readInt32();
         if (err < 0) {
             ALOGD("exportKey() caught exception %d\n", err);
             result->resultCode = KM_ERROR_UNKNOWN_ERROR;