Dmitry Dementyev 7d21d719a5 Merge "Migrate recoverablekeystore to KeyStore V2." am: dbf8a7c1bd am: 26085ee2ff am: 25de7c49b8 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c23d408e34d6305784e54b7ef00a258b4ea6fab

2021-03-01 08:07:59 +00:00

..

keymaster

Add support for app-generated attestation keys.

2021-02-17 06:46:13 -07:00

keystore

Merge "Migrate recoverablekeystore to KeyStore V2." am: dbf8a7c1bd am: 26085ee2ff am: 25de7c49b8

2021-03-01 08:07:59 +00:00

net

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07:00

ConfirmationAlreadyPresentingException.java

…

ConfirmationCallback.java

…

ConfirmationNotAvailableException.java

…

ConfirmationPrompt.java

Keystore 2.0: Android Protected Confirmation

2020-12-16 10:47:56 -08:00

FileIntegrityManager.java

…

FrameworkNetworkSecurityPolicy.java

…

IFileIntegrityService.aidl

…

KeystoreArguments.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

NetworkSecurityPolicy.java

…

OWNERS

Add owners for Protected Confirmation implementation.

2020-12-16 09:57:11 -08:00

Scrypt.java

…