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

Commit 0992040e authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Merge "Fix operation auth bound keys." am: b3671c4a am: f941d3fb 

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

Change-Id: Ia2c52ec3e34b067d61b605fd4bb0bcbc3b420e55
parents a4ca0672 f941d3fb

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);

    }



    /**