diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-04-17 07:09:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-17 07:09:40 +0000 |
| commit | e5ae08e49d1775ae04670ce5c9aa57c951ae0909 (patch) | |
| tree | e647ba806071c8b581b55f89aa8f81e27afadc7d | |
| parent | 86d8e12a06d4f26aa3576ce1492b4ea4391ad697 (diff) | |
| parent | 0992040e485e240dddd0317332b09208117be721 (diff) | |
Merge "Fix operation auth bound keys." am: b3671c4ab5 am: f941d3fb5b am: 0992040e48
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677200
Change-Id: Ie4972c2b9da95515b3e98f66af716e7d1fcf156c
| -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); } /** |