Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix operation auth bound keys." am: b3671c4ab5 am: f941d3fb5b am: 0992040e48

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

Change-Id: Ie4972c2b9da95515b3e98f66af716e7d1fcf156c
This commit is contained in:
Janis Danisevskis
2021-04-17 07:09:40 +00:00
committed by Automerger Merge Worker
parent 86d8e12a06 0992040e48
commit e5ae08e49d
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/hardware/biometrics/CryptoObject.java
View File

@@ -18,7 +18,7 @@ package android.hardware.biometrics;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.security.identity.IdentityCredential; import android.security.identity.IdentityCredential;
import android.security.keystore.AndroidKeyStoreProvider; import android.security.keystore2.AndroidKeyStoreProvider;
import java.security.Signature; import java.security.Signature;

6
keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
View File

@@ -62,10 +62,8 @@ public class AndroidKeyStoreProvider extends Provider {
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
public static long getKeyStoreOperationHandle(Object cryptoPrimitive) { public static long getKeyStoreOperationHandle(Object cryptoPrimitive) {
if (cryptoPrimitive == null) { return android.security.keystore2.AndroidKeyStoreProvider
throw new NullPointerException(); .getKeyStoreOperationHandle(cryptoPrimitive);
}
return 0;
} }
/** /**