Treehugger Robot 15e1f8f5eb Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e am: f2abffe107 am: df8410e677 ...

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

Change-Id: I654b14fb0386d5bea6d22e37a394b00c1f66a87c

2020-11-06 02:14:41 +00:00

..

keymaster

Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e am: f2abffe107 am: df8410e677

2020-11-06 02:14:41 +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

…