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