diff options
| author | Kenny Root <kroot@google.com> | 2013-02-04 15:10:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-04 15:10:22 -0800 |
| commit | 516fab2404f550aca03b3774bd5b279d4e69dd9f (patch) | |
| tree | 1277c2393a27b7146cae657e1bfc6e5a336dc936 /keystore/java | |
| parent | 3789b2fb823b7632e410c0191ddf77dc1e875196 (diff) | |
| parent | 133c5f5e91e72cff1a9a3a4903a0efc96b39165b (diff) | |
| download | frameworks_base-516fab2404f550aca03b3774bd5b279d4e69dd9f.zip frameworks_base-516fab2404f550aca03b3774bd5b279d4e69dd9f.tar.gz frameworks_base-516fab2404f550aca03b3774bd5b279d4e69dd9f.tar.bz2 | |
am 133c5f5e: Merge "AndroidKeyStore: fix tests"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '133c5f5e91e72cff1a9a3a4903a0efc96b39165b':
AndroidKeyStore: fix tests
Diffstat (limited to 'keystore/java')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 44be804..444dc1d 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -243,7 +243,7 @@ public class KeyStore { */ public long getmtime(String key) { try { - return mBinder.getmtime(key); + return mBinder.getmtime(key) * 1000L; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return -1L; |