Merge "AndroidKeyStore: return error code on error"

2013-02-05 00:20:46 +00:00
parent 5a720bb9b0 e66769ad51
commit 74637db21e
1 changed files with 6 additions and 1 deletions
--- 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;