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

Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-03 01:55:30 +00:00
committed by Android (Google) Code Review
parent 4df40c827e 0f23660488
commit 41d6d7c424
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,7 +285,17 @@ public class RecoveryController {
public void initRecoveryService( public void initRecoveryService(
@NonNull String rootCertificateAlias, @NonNull byte[] signedPublicKeyList) @NonNull String rootCertificateAlias, @NonNull byte[] signedPublicKeyList)
throws CertificateException, InternalRecoveryServiceException { throws CertificateException, InternalRecoveryServiceException {
throw new CertificateException("Deprecated initRecoveryService method called"); try {
mBinder.initRecoveryService(rootCertificateAlias, signedPublicKeyList);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
} catch (ServiceSpecificException e) {
if (e.errorCode == ERROR_BAD_CERTIFICATE_FORMAT
|| e.errorCode == ERROR_INVALID_CERTIFICATE) {
throw new CertificateException("Invalid certificate for recovery service", e);
}
throw wrapUnexpectedServiceSpecificException(e);
}
} }
/** /**