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

Merge "Fix operation auth bound keys."

Browse Source
This commit is contained in:
Janis Danisevskis
2021-04-17 05:51:38 +00:00
committed by Gerrit Code Review
parent 28aca09bbf 8c97d4fe79
commit b3671c4ab5
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.security.identity.IdentityCredential;
import android.security.keystore.AndroidKeyStoreProvider;
import android.security.keystore2.AndroidKeyStoreProvider;
import java.security.Signature;

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

@@ -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);
}
/**