commit 16acd811e10bd13e403fe0bc877c8b0b779547e9
author Paul Lawrence <paullawrence@google.com> Tue Aug 26 04:53:24 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 26 04:53:24 2014 +0000
tree 6bf261245a64df162f64a0bc144a78088ea89ba0
parent 4f3f54225542ca2ba6aa7067f9949bd697b02013
parent 715775046c79f04d8975da53efcfbd1b70abe699

am 71577504: Show correct remaining time

* commit '715775046c79f04d8975da53efcfbd1b70abe699':
  Show correct remaining time

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index bb9b2e2..bd6cf58 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1995,8 +1995,12 @@
                                    - data->used_blocks_already_done;
         int remaining_time = (int)(elapsed_time * remaining_blocks
                                    / data->used_blocks_already_done);
+
+        // Change time only if not yet set, lower, or a lot higher for
+        // best user experience
         if (data->remaining_time == -1
-            || remaining_time < data->remaining_time) {
+            || remaining_time < data->remaining_time
+            || remaining_time > data->remaining_time + 60) {
             char buf[8];
             snprintf(buf, sizeof(buf), "%d", remaining_time);
             property_set("vold.encrypt_time_remaining", buf);