commit bbe6608868a19e475f1872db5b7561fe4a219062
author Xin Li <delphij@google.com> Mon Nov 23 11:30:43 2020 -0800
committer Xin Li <delphij@google.com> Mon Nov 23 11:30:43 2020 -0800
tree b75d389f23adf50dbbd62de334a7777e1733b177
parent a48faff89c7f8c4dce909bd0caf393700209c04e
parent ded1a89754201448690f9edafba6226aff4bd96a

Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ib5766550a76eb3bd1b71a8c9bd6547dc5ecd2143

src/vogar/commands/Command.java

diff --git a/src/vogar/commands/Command.java b/src/vogar/commands/Command.java
index dbd4daf..60c30b7 100644
--- a/src/vogar/commands/Command.java
+++ b/src/vogar/commands/Command.java
@@ -308,7 +308,7 @@
      */
     private abstract class TimeoutTask implements Runnable {
         public final void schedule() {
-            timer.schedule(this, System.nanoTime() - timeoutNanoTime, TimeUnit.NANOSECONDS);
+            timer.schedule(this, timeoutNanoTime - System.nanoTime(), TimeUnit.NANOSECONDS);
         }
 
         protected abstract void onTimeout(Process process);
@@ -324,7 +324,7 @@
                 onTimeout(process);
             } else {
                 // if the kill time has been pushed back, reschedule
-                timer.schedule(this, System.nanoTime() - timeoutNanoTime, TimeUnit.NANOSECONDS);
+                schedule();
             }
         }
     }