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 
am: 41d6d7c424

Change-Id: I38d4c4d99879961631b6596d1f37a65afe11a5b1
This commit is contained in:
Dmitry Dementyev
2018-04-02 21:36:05 -07:00
committed by android-build-merger
parent 2fb025d007 41d6d7c424
commit 64209d7b1a
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(
@NonNull String rootCertificateAlias, @NonNull byte[] signedPublicKeyList)
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);
}
}
/**