Orion Hodson 525a22a777 Merge "Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."" am: bc641a41d8 am: 9e21ecbcb4 am: 1de159412b ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie45400513bc12278a68c8af1b5a12ba754f048c5

2020-12-11 14:02:26 +00:00

..

keymaster

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

2020-12-11 10:45:43 +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

…