am 887c5236: am 74637db2: Merge "AndroidKeyStore: return error code on error"

# Via Android Git Automerger (1) and others
* commit '887c523646012f4f0b63f5ffd0a1e9ebc3c2bdf1':
  AndroidKeyStore: return error code on error

1 files changed, 6 insertions, 1 deletions

diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java
index 444dc1d41b1c..ceaff37f3c59 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;