Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f236604 authored by Dmitry Dementyev's avatar Dmitry Dementyev
Browse files

Revert "Throw invalid cert exception when deprecated initRecoveryService method" 

This reverts commit 50bc7e42.

Reason for revert: API is still used by old binary

Change-Id: I3c8348211baa26245786abda6360a8df96e2d223
Bug: 77293264
parent 50bc7e42

core/java/android/security/keystore/recovery/RecoveryController.java

+11 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }



    /**