| commit | acfdc30e3793512de4b9a5e15da69533735dd8be | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Tue Dec 02 18:34:14 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 02 18:34:14 2014 +0000 |
| tree | 3c5ac2a9af38f6ebdbb82aa810bdf34d79a561cf | |
| parent | d44a8f59a7518b87a3fe4174c78dfb9727e63f89 [diff] | |
| parent | ef2b5bea6b72331568036788c6fcaadf63f1f178 [diff] |
Merge "Fix error in clocks leading to devices staying unlocked" into lmp-mr1-dev
diff --git a/cryptfs.c b/cryptfs.c index 7976e11..a424b69 100644 --- a/cryptfs.c +++ b/cryptfs.c
@@ -3742,7 +3742,7 @@ char* cryptfs_get_password() { struct timespec now; - clock_gettime(CLOCK_MONOTONIC, &now); + clock_gettime(CLOCK_BOOTTIME, &now); if (now.tv_sec < password_expiry_time) { return password; } else {