diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-04-17 06:44:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-17 06:44:19 +0000 |
| commit | 0992040e485e240dddd0317332b09208117be721 (patch) | |
| tree | 429f34f5543b0378250a3fcff94f6cee12e69f1f | |
| parent | a4ca0672844235fca5878eaa2fe4f70f9a7c636a (diff) | |
| parent | f941d3fb5b2ef5cdcaeb3c6a1dc2f5ada608dd60 (diff) | |
Merge "Fix operation auth bound keys." am: b3671c4ab5 am: f941d3fb5b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677200
Change-Id: Ia2c52ec3e34b067d61b605fd4bb0bcbc3b420e55
| -rw-r--r-- | core/java/android/hardware/biometrics/CryptoObject.java | 2 | ||||
| -rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreProvider.java | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/core/java/android/hardware/biometrics/CryptoObject.java b/core/java/android/hardware/biometrics/CryptoObject.java index 0af18dfb0e3a..7648cf241298 100644 --- a/core/java/android/hardware/biometrics/CryptoObject.java +++ b/core/java/android/hardware/biometrics/CryptoObject.java @@ -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; diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java index ecb082e71321..62fe54f1f089 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java @@ -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); } /** |