OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
5a720bb
)
AndroidKeyStore: return error code on error
author
Kenny Root
<kroot@google.com>
Mon, 4 Feb 2013 23:49:11 +0000
(15:49 -0800)
committer
Kenny Root
<kroot@google.com>
Mon, 4 Feb 2013 23:50:58 +0000
(15:50 -0800)
Instead of blindly multiplying return value by 1000 to convert to
milliseconds, check to see if it's an error condition first.
Change-Id: I8eab1e7a86d78c13458fcbbc79d590e452fc9791
keystore/java/android/security/KeyStore.java
patch
|
blob
|
history
diff --git
a/keystore/java/android/security/KeyStore.java
b/keystore/java/android/security/KeyStore.java
index
444dc1d
..
ceaff37
100644
(file)
--- 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;