Merge remote-tracking branch 'origin/master'

2026-09-27 10:03:11 +07:00 · 2013-09-10 15:40:42 +04:00
parent 6bae9e1008 73bc4cbe14
commit 2fb38cfc98
1 changed files with 5 additions and 1 deletions
@@ -45,8 +45,12 @@ public class SingleAlarm extends Alarm {
    }
  }

-  public void cancelAndRequest() {
+  public void cancel() {
    cancelAllRequests();
+  }
+
+  public void cancelAndRequest() {
+    cancel();
    addRequest(delay);
  }