commit 52047ab160629275f77d9dba6d69eb223986bdda
author Chris Tate <ctate@android.com> Sat Jun 13 02:25:25 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 13 02:25:25 2015 +0000
tree d622508b32bea3b986c58cd288f290b35270cc31
parent c425e570141a6466ff81f36eb86cb91188c41c77
parent 386a5a2940acd346f1d9e81c87dfa87e7d146065

am 386a5a29: am 396b83b0: Merge "Fix overflow/underflow problem in comparison"

* commit '386a5a2940acd346f1d9e81c87dfa87e7d146065':
  Fix overflow/underflow problem in comparison

services/core/java/com/android/server/AlarmManagerService.java

diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java
index 26ece72..34f146c 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -400,10 +400,10 @@
         public int compare(Batch b1, Batch b2) {
             long when1 = b1.start;
             long when2 = b2.start;
-            if (when1 - when2 > 0) {
+            if (when1 > when2) {
                 return 1;
             }
-            if (when1 - when2 < 0) {
+            if (when1 < when2) {
                 return -1;
             }
             return 0;
@@ -1806,10 +1806,10 @@
         public int compare(Alarm a1, Alarm a2) {
             long when1 = a1.whenElapsed;
             long when2 = a2.whenElapsed;
-            if (when1 - when2 > 0) {
+            if (when1 > when2) {
                 return 1;
             }
-            if (when1 - when2 < 0) {
+            if (when1 < when2) {
                 return -1;
             }
             return 0;