Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add more NonNull annotations to RecoveryController API" into pi-dev

Browse Source
This commit is contained in:
Dmitry Dementyev
2018-03-24 03:48:12 +00:00
committed by Android (Google) Code Review
parent a68dfc3cee 0bbaf189c2
commit ea97f89048
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/security/keystore/recovery/RecoveryController.java
View File

@@ -496,7 +496,7 @@ public class RecoveryController {
* screen is required to generate recoverable keys.
*/
@RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
public Key generateKey(@NonNull String alias) throws InternalRecoveryServiceException,
public @NonNull Key generateKey(@NonNull String alias) throws InternalRecoveryServiceException,
LockScreenRequiredException {
try {
String grantAlias = mBinder.generateKey(alias);
@@ -527,7 +527,7 @@ public class RecoveryController {
*
*/
@RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
public Key importKey(@NonNull String alias, byte[] keyBytes)
public @NonNull Key importKey(@NonNull String alias, @NonNull byte[] keyBytes)
throws InternalRecoveryServiceException, LockScreenRequiredException {
try {
String grantAlias = mBinder.importKey(alias, keyBytes);
@@ -575,7 +575,7 @@ public class RecoveryController {
/**
* Returns the key with the given {@code grantAlias}.
*/
Key getKeyFromGrant(String grantAlias) throws UnrecoverableKeyException {
@NonNull Key getKeyFromGrant(@NonNull String grantAlias) throws UnrecoverableKeyException {
return AndroidKeyStoreProvider.loadAndroidKeyStoreKeyFromKeystore(
mKeyStore,
grantAlias,
@@ -611,7 +611,7 @@ public class RecoveryController {
}
@RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
public Map<String, X509Certificate> getRootCertificates() {
public @NonNull Map<String, X509Certificate> getRootCertificates() {
return TrustedRootCertificates.getRootCertificates();
}

2
core/java/android/security/keystore/recovery/RecoverySession.java
View File

@@ -257,7 +257,7 @@ public class RecoverySession implements AutoCloseable {
}
/** Given a map from alias to grant alias, returns a map from alias to a {@link Key} handle. */
private @NonNull Map<String, Key> getKeysFromGrants(Map<String, String> grantAliases)
private @NonNull Map<String, Key> getKeysFromGrants(@NonNull Map<String, String> grantAliases)
throws InternalRecoveryServiceException {
ArrayMap<String, Key> keysByAlias = new ArrayMap<>(grantAliases.size());
for (String alias : grantAliases.keySet()) {