Adam Vartanian 86b381be69 Merge "Inline two short methods from Conscrypt" am: 9da9b33cc2 am: 91d61ea0ed ...

am: 8879ee4a78

Change-Id: Iffbb91414c16b055fc3358e83fb5c23ef4998816

2018-09-25 02:33:46 -07:00

..

keymaster

Add @UnsupportedAppUsage annotations

2018-08-16 18:49:37 +01:00

keystore

Revert "Revert "Change the root of trust for CryptAuth Vault Service""

2018-05-11 05:11:11 +00:00

net/config

Merge "Inline two short methods from Conscrypt" am: 9da9b33cc2 am: 91d61ea0ed

2018-09-25 02:33:46 -07:00

ConfirmationAlreadyPresentingException.java

Add Confirmation API.

2018-01-30 17:33:21 -05:00

ConfirmationCallback.java

ConfirmationPrompt: Update for API review.

2018-04-04 10:00:42 -04:00

ConfirmationNotAvailableException.java

Add Confirmation API.

2018-01-30 17:33:21 -05:00

ConfirmationPrompt.java

ConfirmationPrompt: Update for API review.

2018-04-04 10:00:42 -04:00

FrameworkNetworkSecurityPolicy.java

…

KeystoreArguments.java

Add @UnsupportedAppUsage annotations

2018-08-16 18:49:37 +01:00

NetworkSecurityPolicy.java

…

OWNERS

…

Scrypt.java

Expose the JNI scrypt function in a standalone Java class so we can

2018-04-02 15:47:08 -07:00