From a7d39cff968e8972678537db27f7ca2e35827bf4 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Thu, 4 May 2017 08:38:07 -0700
Subject: [PATCH] Fix frozen alarm issue

Bug 34724174
Test: Manual test with "dumpsys alarm" + putting device into doze

Change-Id: I1d9ec3ac1e78ea263b2598a8c7ab4157ec40c535
---
 core/java/android/app/AlarmManager.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/java/android/app/AlarmManager.java b/core/java/android/app/AlarmManager.java
index 3221c5d895431..620e5cf374ca8 100644
--- a/core/java/android/app/AlarmManager.java
+++ b/core/java/android/app/AlarmManager.java
@@ -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();