Janis Danisevskis 976991edea Merge "Add owners for Protected Confirmation implementation." am: 9bb6231bd2 am: 2fb83e12c7 am: 0d2b2dd166 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cdda7f97b5bcaf111acba6143ae24ab0bf7e107

2020-12-16 23:06:28 +00:00

..

keymaster

Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."

2020-12-11 20:36:10 +00: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

…

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

…