summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-11-16 22:51:03 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-11-16 22:51:03 +0000
commitaeb15e8592b9a74937afbb3fa232d2ced5971f3c (patch)
tree1d60d433579554151324eb04664f6205ba426d53 /api
parentfebaec9f3e70de992cc6cc72789aa95c0b80a66f (diff)
parent4392c6977ce935a084ab30baeed511f170a606d5 (diff)
Merge changes I9731d978,I9e325782,I441a4d4d,I86a85e48,I9268fd66, ...
* changes: Keystore 2.0 SPI: Install legacy Keystore provider as AndroidKeyStoreLegacy Keystore 2.0 SPI: Zygote install Keystore2 provider conditionally Keystore 2.0 SPI: Evolve the generator SPI. Keystore 2.0 SPI: Evolve Factory SPI Keystore 2.0 SPI: AndroidKeyStoreProvider loads keys from Keystore 2.0 Keystore 2.0 SPI: Evolve the Crypto SPI. Keystore 2.0 SPI: KeyParameter utilities. Keystore 2.0 SPI: Update the chunked streamer. Keystore 2.0 SPI: KeyStoreCryptoOperationUtils Keystore 2.0 SPI: KeyStoreKeys adopt Keystore 2.0 Keystore 2.0: Shim around the basic functionality of Keystore 2.0 Keystore 2.0 SPI: Duplicate Keystore SPI to android.security.keystore2 package
Diffstat (limited to 'api')
-rw-r--r--api/current.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 69f76451a5c4..6632db3d7acf 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -42742,6 +42742,12 @@ package android.security.identity {
package android.security.keystore {
+ public class BackendBusyException extends java.security.ProviderException {
+ ctor public BackendBusyException();
+ ctor public BackendBusyException(@NonNull String);
+ ctor public BackendBusyException(@NonNull String, @NonNull Throwable);
+ }
+
public class KeyExpiredException extends java.security.InvalidKeyException {
ctor public KeyExpiredException();
ctor public KeyExpiredException(String);