Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix overflow/underflow problem in comparison"

Browse Source
This commit is contained in:
Chris Tate
2015-06-12 19:52:44 +00:00
committed by Gerrit Code Review
parent 7f0b56527f cdaaeeec0d
commit 396b83b0c8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/AlarmManagerService.java
View File

@@ -369,10 +369,10 @@ class AlarmManagerService extends SystemService {
public int compare(Batch b1, Batch b2) { public int compare(Batch b1, Batch b2) {
long when1 = b1.start; long when1 = b1.start;
long when2 = b2.start; long when2 = b2.start;
if (when1 - when2 > 0) { if (when1 > when2) {
return 1; return 1;
} }
if (when1 - when2 < 0) { if (when1 < when2) {
return -1; return -1;
} }
return 0; return 0;
@@ -1482,10 +1482,10 @@ class AlarmManagerService extends SystemService {
public int compare(Alarm a1, Alarm a2) { public int compare(Alarm a1, Alarm a2) {
long when1 = a1.whenElapsed; long when1 = a1.whenElapsed;
long when2 = a2.whenElapsed; long when2 = a2.whenElapsed;
if (when1 - when2 > 0) { if (when1 > when2) {
return 1; return 1;
} }
if (when1 - when2 < 0) { if (when1 < when2) {
return -1; return -1;
} }
return 0; return 0;