Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joe LaPenna
2016-04-01 22:22:44 +00:00
committed by Android (Google) Code Review
parent 79700d215a 33ee4bf18b
commit f38aa6ba2b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/AlarmManager.java
View File

@@ -905,10 +905,12 @@ public class AlarmManager {
ListenerWrapper wrapper = null;
synchronized (AlarmManager.class) {
final WeakReference<ListenerWrapper> wrapperRef;
wrapperRef = sWrappers.get(listener);
if (wrapperRef != null) {
wrapper = wrapperRef.get();
if (sWrappers != null) {
final WeakReference<ListenerWrapper> wrapperRef;
wrapperRef = sWrappers.get(listener);
if (wrapperRef != null) {
wrapper = wrapperRef.get();
}
}
}