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

Commit b3671c4a authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Gerrit Code Review
Browse files

Merge "Fix operation auth bound keys."

parents 28aca09b 8c97d4fe

core/java/android/hardware/biometrics/CryptoObject.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.hardware.biometrics; 


import android.annotation.NonNull;

import android.security.identity.IdentityCredential;

import android.security.keystore.AndroidKeyStoreProvider;

import android.security.keystore2.AndroidKeyStoreProvider;



import java.security.Signature;

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

+2 −4
Original line number Diff line number Diff line
@@ -62,10 +62,8 @@ public class AndroidKeyStoreProvider extends Provider { 
     */

    @UnsupportedAppUsage

    public static long getKeyStoreOperationHandle(Object cryptoPrimitive) {

        if (cryptoPrimitive == null) {

            throw new NullPointerException();

        }

        return 0;

        return android.security.keystore2.AndroidKeyStoreProvider

                .getKeyStoreOperationHandle(cryptoPrimitive);

    }



    /**