commit 1433d42cea008f924e5959910033e21f4f3f6193
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 21 20:36:45 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 21 20:36:45 2021 +0000
tree 44fd977b29229a04d3a4e42a3736e4c9e3483731
parent c7e586a7bfe3d6dbd1647ae381a663ddbe072895
parent c4abbe64271bb1b4181fe057d9d6032d594d8917

Merge "trusty: keymaster-hal: Reconnect on failed VERSION"

trusty/keymaster/TrustyKeymaster.cpp

diff --git a/trusty/keymaster/TrustyKeymaster.cpp b/trusty/keymaster/TrustyKeymaster.cpp
index 5690031..23e0433 100644
--- a/trusty/keymaster/TrustyKeymaster.cpp
+++ b/trusty/keymaster/TrustyKeymaster.cpp
@@ -37,6 +37,12 @@
     if (versionRsp.error != KM_ERROR_OK) {
         ALOGW("TA appears not to support GetVersion2, falling back (err = %d)", versionRsp.error);
 
+        err = trusty_keymaster_connect();
+        if (err) {
+            ALOGE("Failed to connect to trusty keymaster %d", err);
+            return err;
+        }
+
         GetVersionRequest versionReq;
         GetVersionResponse versionRsp;
         GetVersion(versionReq, &versionRsp);