ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "trusty: keymaster-hal: Reconnect on failed VERSION" am: 1433d42cea am: c1ec38f7be

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I224c448c513fc12bfaaaf45fc32096cefd86cb10
This commit is contained in:
Treehugger Robot 2021-01-21 23:23:07 +00:00 • committed by Automerger Merge Worker
commit 547bb7ba76
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
trusty/keymaster/TrustyKeymaster.cpp
View file

@ -37,6 +37,12 @@ int TrustyKeymaster::Initialize() {
if (versionRsp.error != KM_ERROR_OK) { if (versionRsp.error != KM_ERROR_OK) {
ALOGW("TA appears not to support GetVersion2, falling back (err = %d)", versionRsp.error); 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; GetVersionRequest versionReq;
GetVersionResponse versionRsp; GetVersionResponse versionRsp;
GetVersion(versionReq, &versionRsp); GetVersion(versionReq, &versionRsp);