Commit 1acd32a6 authored May 27, 2015 by jinho.park Committed by Christopher Tate May 28, 2015

DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order.

The comparator used variable "when" in IncreasingTimeOrder class.
variable "when" means "elapsed time" or "real time"(RTC) and these types have different unit of time.
so, I recommend that you use a "whenElapsed" which has the equal unit of time as its default value.

Signed-off-by: Jinho Park <jinho.park@lge.com>

Cherry-pick from master

Change-Id: Ib95531bf235e8fc628a7eda1c24d187c12a9ab3b

parent b3af4f43

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1706,8 +1706,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;
		}