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 
am: f38aa6b

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

Change-Id: I6cb099702b9a0681e8f5c939487f3587af73e656
This commit is contained in:
Joe LaPenna
2016-04-01 22:29:34 +00:00
committed by android-build-merger
parent 674a90dc22 f38aa6ba2b
commit 6a935d1aa8
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();
}
}
}