Keystore 2.0: Fix getKey returns null on key not found. (b6a9ed2f) · Commits · e / os / android_frameworks_base

keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -352,11 +352,14 @@ public class AndroidKeyStoreProvider extends Provider {
		try {
		response = keyStore.getKeyEntry(descriptor);
		} catch (android.security.KeyStoreException e) {
		if (e.getErrorCode() == ResponseCode.KEY_PERMANENTLY_INVALIDATED) {
		switch (e.getErrorCode()) {
		case ResponseCode.KEY_NOT_FOUND:
		return null;
		case ResponseCode.KEY_PERMANENTLY_INVALIDATED:
		throw new KeyPermanentlyInvalidatedException(
		"User changed or deleted their auth credentials",
		e);
		} else {
		default:
		throw (UnrecoverableKeyException)
		new UnrecoverableKeyException("Failed to obtain information about key")
		.initCause(e);