diff options
| author | Kenny Root <kroot@google.com> | 2015-04-24 22:00:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 22:00:56 +0000 |
| commit | 6c1af7ea497b1a2f04bdf45a19d2147f5b9665b9 (patch) | |
| tree | 878fa3057075631f0e87065aaf582d7cf1859284 /keystore/java/android/security/KeyStore.java | |
| parent | f9c14b7d169d502b63d1d5b329475a97b02f3848 (diff) | |
| parent | 8652bce13765fb29329df2a4ccca4591bae28de5 (diff) | |
am 8652bce1: am c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '8652bce13765fb29329df2a4ccca4591bae28de5':
frameworks/base: switch to using NativeConstants.
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index ff8534df3f4a..3bc1b1773695 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -16,7 +16,7 @@ package android.security; -import com.android.org.conscrypt.NativeCrypto; +import com.android.org.conscrypt.NativeConstants; import android.os.Binder; import android.os.IBinder; @@ -88,9 +88,9 @@ public class KeyStore { static int getKeyTypeForAlgorithm(String keyType) { if ("RSA".equalsIgnoreCase(keyType)) { - return NativeCrypto.EVP_PKEY_RSA; + return NativeConstants.EVP_PKEY_RSA; } else if ("EC".equalsIgnoreCase(keyType)) { - return NativeCrypto.EVP_PKEY_EC; + return NativeConstants.EVP_PKEY_EC; } else { return -1; } |