Treehugger Robot 30f8a371b7 Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe am: 4ac4916c8d am: cf7203f5d3 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I024a2f38dfd2432ae77d6a032c27fc8389cf62dc

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

Improve OWNERS coverage across frameworks/base/.

2020-12-08 08:36:27 -07:00

Scrypt.java

…