Treehugger Robot 5bdd02628d Merge "Keystore 2.0: Android Protected Confirmation" am: 30841f177c am: 3443d2b671 am: ca6272cf1e ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9bb924273fb712efb270e8afbe194604ce1f90ce

2021-01-06 01:52:47 +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

Keystore 2.0: Android Protected Confirmation

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

FileIntegrityManager.java

Respect app-ops permission in FileIntegrityService

2020-03-27 09:23:41 -07:00

FrameworkNetworkSecurityPolicy.java

…

IFileIntegrityService.aidl

Respect app-ops permission in FileIntegrityService

2020-03-27 09:23:41 -07:00

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

…