Merge "Fix frozen alarm issue" into oc-dev (af4bfcdb) · Commits · e / os / android_frameworks_base

core/java/android/app/AlarmManager.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -226,11 +226,7 @@ public class AlarmManager {
		@Override
		public void doAlarm(IAlarmCompleteListener alarmManager) {
		mCompletion = alarmManager;
		mHandler.post(this);
		}

		@Override
		public void run() {
		// Remove this listener from the wrapper cache first; the server side
		// already considers it gone
		synchronized (AlarmManager.class) {
		@@ -239,6 +235,11 @@ public class AlarmManager {
		}
		}

		mHandler.post(this);
		}

		@Override
		public void run() {
		// Now deliver it to the app
		try {
		mListener.onAlarm();