Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keystore 2.0: Silence common error on operation abort." am: 492ab3dd2c am: 11cb680764

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I748c8b9f0b830d66c226478da714ce6e77f0752f
This commit is contained in:
Treehugger Robot
2021-03-08 15:22:52 +00:00
committed by Automerger Merge Worker
parent 8ad13e49a0 11cb680764
commit b956f8b6f0
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
keystore/java/android/security/keystore2/KeyStoreCryptoOperationUtils.java
View File

@@ -18,6 +18,7 @@ package android.security.keystore2;
import android.app.ActivityThread;
import android.hardware.biometrics.BiometricManager;
import android.hardware.security.keymint.ErrorCode;
import android.security.GateKeeper;
import android.security.KeyStore;
import android.security.KeyStoreException;
@@ -183,15 +184,19 @@ abstract class KeyStoreCryptoOperationUtils {
try {
operation.abort();
} catch (KeyStoreException e) {
// We log this error, but we can afford to ignore it. Dropping the reference
// to the KeyStoreOperation is enough to clean up all related resources even
// in the Keystore daemon. We log it anyway, because it may indicate some
// underlying problem that is worth debugging.
Log.w(
"KeyStoreCryptoOperationUtils",
"Encountered error trying to abort a keystore operation.",
e
);
// Invalid operation handle is very common at this point. It occurs every time
// an already finalized operation gets aborted.
if (e.getErrorCode() != ErrorCode.INVALID_OPERATION_HANDLE) {
// This error gets logged but ignored. Dropping the reference
// to the KeyStoreOperation is enough to clean up all related resources even
// in the Keystore daemon. It gets logged anyway, because it may indicate some
// underlying problem that is worth debugging.
Log.w(
"KeyStoreCryptoOperationUtils",
"Encountered error trying to abort a keystore operation.",
e
);
}
}
}
}