Janis Danisevskis 9060b67f0f Merge changes I7c17ab51,I5bd4acb4,I93270f00 am: 18bbac10c1 am: 68acc834d4 am: c04b6004a3 ...

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

Change-Id: I59184b7d4a01b1478599b53b6f7dd1fc3b3c5465

2020-11-02 21:14:04 +00:00

..

keymaster

Merge changes I7c17ab51,I5bd4acb4,I93270f00 am: 18bbac10c1 am: 68acc834d4 am: c04b6004a3

2020-11-02 21:14:04 +00:00

keystore

…

net/config

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

2020-08-31 21:21:38 -07:00

ConfirmationAlreadyPresentingException.java

…

ConfirmationCallback.java

…

ConfirmationNotAvailableException.java

…

ConfirmationPrompt.java

ConfirmationPrompt: Use default values for UIOptions

2020-01-23 08:17:39 -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-02 10:30:09 +00:00

NetworkSecurityPolicy.java

…

OWNERS

…

Scrypt.java

…