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

Commit da743b68 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." am: 51bf93a3 am: f8a276f3 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fbbcbf584778a03d9844623a18966f4a775d1e5
parents 5a1c2561 f8a276f3

keystore/java/android/security/keystore/AndroidKeyStoreProvider.java

+1 −10
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.security.KeyStore; 
import android.security.keymaster.ExportResult;

import android.security.keymaster.KeyCharacteristics;

import android.security.keymaster.KeymasterDefs;

import android.sysprop.Keystore2Properties;



import java.io.IOException;

import java.security.KeyFactory;
@@ -117,8 +116,6 @@ public class AndroidKeyStoreProvider extends Provider { 
        putSecretKeyFactoryImpl("HmacSHA512");

    }



    private static boolean sKeystore2Enabled;



    /**

     * This function indicates whether or not Keystore 2.0 is enabled. Some parts of the

     * Keystore SPI must behave subtly differently when Keystore 2.0 is enabled. However,
@@ -133,10 +130,9 @@ public class AndroidKeyStoreProvider extends Provider { 
     * @hide

     */

    public static boolean isKeystore2Enabled() {

        return sKeystore2Enabled;

        return android.security.keystore2.AndroidKeyStoreProvider.isInstalled();

    }





    /**

     * Installs a new instance of this provider (and the

     * {@link AndroidKeyStoreBCWorkaroundProvider}).
@@ -164,11 +160,6 @@ public class AndroidKeyStoreProvider extends Provider { 
            // priority.

            Security.addProvider(workaroundProvider);

        }



        // {@code install()} is run by zygote when this property is still accessible. We store its

        // value so that the Keystore SPI can act accordingly without having to access an internal

        // property.

        sKeystore2Enabled = Keystore2Properties.keystore2_enabled().orElse(false);

    }



    private void putSecretKeyFactoryImpl(String algorithm) {