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

Commit 9c2c7dd0 authored by Yo Chiang's avatar Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: Fix infinit recursion." am: 544f3d52 am: d6872459 am:... 

Merge "Keystore 2.0: Fix infinit recursion." am: 544f3d52 am: d6872459 am: bcd0c980 am: 7d66876d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645913

Change-Id: Id4e9c380221ee31eb950c2bf4656f62dbf9b716c
parents 22b65356 7d66876d

keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java

+3 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor 
        resetAll();



        // Public key operations get diverted to the default provider.

        if (opmode == Cipher.ENCRYPT_MODE

        if (!(key instanceof AndroidKeyStorePrivateKey)

                && (key instanceof PrivateKey || key instanceof PublicKey)) {

            try {

                mCipher = Cipher.getInstance(getTransform());
@@ -186,7 +186,7 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor 
        resetAll();



        // Public key operations get diverted to the default provider.

        if (opmode == Cipher.ENCRYPT_MODE

        if (!(key instanceof AndroidKeyStorePrivateKey)

                && (key instanceof PrivateKey || key instanceof PublicKey)) {

            try {

                mCipher = Cipher.getInstance(getTransform());
@@ -216,7 +216,7 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor 
        resetAll();



        // Public key operations get diverted to the default provider.

        if (opmode == Cipher.ENCRYPT_MODE

        if (!(key instanceof AndroidKeyStorePrivateKey)

                && (key instanceof PrivateKey || key instanceof PublicKey)) {

            try {

                mCipher = Cipher.getInstance(getTransform());