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

Commit f38aa6ba authored by Joe LaPenna's avatar Joe LaPenna Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in AlarmManager.cancel(...)" into nyc-dev

parents 79700d21 33ee4bf1

core/java/android/app/AlarmManager.java

+6 −4
Original line number Diff line number Diff line
@@ -905,12 +905,14 @@ public class AlarmManager { 


        ListenerWrapper wrapper = null;

        synchronized (AlarmManager.class) {

            if (sWrappers != null) {

                final WeakReference<ListenerWrapper> wrapperRef;

                wrapperRef = sWrappers.get(listener);

                if (wrapperRef != null) {

                    wrapper = wrapperRef.get();

                }

            }

        }



        if (wrapper == null) {

            Log.w(TAG, "Unrecognized alarm listener " + listener);