diff options
| author | Kenny Root <kroot@google.com> | 2013-02-05 00:20:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-05 00:20:47 +0000 |
| commit | 74637db21eb0b3c0167378e2b5c866fdc02e51f2 (patch) | |
| tree | 22123fc2bb1210baa71e79671e44f7a4aad1daf1 /keystore | |
| parent | 5a720bb9b031d44e593d2054bda586ccc3752aa4 (diff) | |
| parent | e66769ad5194cb4533d1087416a2e804ac384285 (diff) | |
| download | frameworks_base-74637db21eb0b3c0167378e2b5c866fdc02e51f2.zip frameworks_base-74637db21eb0b3c0167378e2b5c866fdc02e51f2.tar.gz frameworks_base-74637db21eb0b3c0167378e2b5c866fdc02e51f2.tar.bz2 | |
Merge "AndroidKeyStore: return error code on error"
Diffstat (limited to 'keystore')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 444dc1d..ceaff37 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -243,7 +243,12 @@ public class KeyStore { */ public long getmtime(String key) { try { - return mBinder.getmtime(key) * 1000L; + final long millis = mBinder.getmtime(key); + if (millis == -1L) { + return -1L; + } + + return millis * 1000L; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return -1L; |