Fix keystore return code

am: 2f96c79a9c

Change-Id: Ie604b001d8804a9d31e82e44f178d7ca7a309da9

1 files changed, 3 insertions, 1 deletions

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 8a952572..c33a1d06 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1163,7 +1163,9 @@ void KeyStoreService::begin(const sp<IBinder>& appToken, const String16& name, K
     // application should get an auth token using the handle before the
     // first call to update, which will fail if keystore hasn't received the
     // auth token.
-    result->resultCode = authResult;
+    if (result->resultCode == ErrorCode::OK) {
+        result->resultCode = authResult;
+    }
 
     // Other result fields were set in the begin operation's callback.
 }