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

Commit cc5bb55a authored by Joe LaPenna's avatar Joe LaPenna Committed by android-build-merger
Browse files

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

am: 6a935d1a

* commit '6a935d1a':
  Fix NPE in AlarmManager.cancel(...)

Change-Id: I2df6b1a266da854752b4f06aff1850eb6adcc010
parents b1547b23 6a935d1a

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