Treehugger Robot d6e1adf8e5 Merge "ECDH SPI interface" am: e43b86d5b1 am: 5e78686425 am: 42cc0967a5 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id09498294433c647915894a00d6b1f5e92acebb4

2021-01-28 14:59:03 +00:00

..

keymaster

ECDH SPI interface

2021-01-27 10:54:47 +01:00

keystore

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07: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

…