Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34ecd41d authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "Fix frozen alarm issue" into oc-dev am: af4bfcdb 

am: 7ff81553

Change-Id: Ibf7da2469f3158110a1d67e1234f949f8a577b00
parents 737b6962 7ff81553

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();