commit aeb15e8592b9a74937afbb3fa232d2ced5971f3c
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 16 22:51:03 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 16 22:51:03 2020 +0000
tree 1d60d433579554151324eb04664f6205ba426d53
parent febaec9f3e70de992cc6cc72789aa95c0b80a66f
parent 4392c6977ce935a084ab30baeed511f170a606d5

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