diff options
| author | Chris Tate <ctate@android.com> | 2015-06-01 20:11:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 20:11:57 +0000 |
| commit | 88fb14532421f049614c34120c706c26a9af6bbd (patch) | |
| tree | ab607daab3e71c04ec3951c974ad9495e24e4e92 /services/core/java/com/android/server/AlarmManagerService.java | |
| parent | b0db15c6d99ab5f9d8a7bd6a44fc097a5f61edca (diff) | |
| parent | 1acd32a60b9ec67878302f6d629c5d5e7e2ee813 (diff) | |
| download | frameworks_base-88fb14532421f049614c34120c706c26a9af6bbd.zip frameworks_base-88fb14532421f049614c34120c706c26a9af6bbd.tar.gz frameworks_base-88fb14532421f049614c34120c706c26a9af6bbd.tar.bz2 | |
Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev
Diffstat (limited to 'services/core/java/com/android/server/AlarmManagerService.java')
| -rw-r--r-- | services/core/java/com/android/server/AlarmManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index deb662d..742f570 100644 --- a/services/core/java/com/android/server/AlarmManagerService.java +++ b/services/core/java/com/android/server/AlarmManagerService.java @@ -1729,8 +1729,8 @@ class AlarmManagerService extends SystemService { */ public static class IncreasingTimeOrder implements Comparator<Alarm> { public int compare(Alarm a1, Alarm a2) { - long when1 = a1.when; - long when2 = a2.when; + long when1 = a1.whenElapsed; + long when2 = a2.whenElapsed; if (when1 - when2 > 0) { return 1; } |