diff options
author | Santos Cordon <santoscordon@google.com> | 2013-09-24 14:19:36 -0700 |
---|---|---|
committer | Santos Cordon <santoscordon@google.com> | 2013-09-24 14:19:36 -0700 |
commit | 7330bc3fd1b98ddbef8f143d3cd27db4a86929fd (patch) | |
tree | 9ae91d4e8c0d18c3f139e59b1169e4cd13bf055f /InCallUI | |
parent | 69e35e542e8d0a072da721ea758d3d4aa91c7ea0 (diff) |
Check for null during notification hangup Intent receipt.
bug:10863336
Change-Id: I775f1855d07cc4f6591ceb51a0f90754ecc833ad
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index 02ac0bec3..499dea0a1 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -308,6 +308,12 @@ public class InCallPresenter implements CallList.Listener { * Hangs up any active or outgoing calls. */ public void hangUpOngoingCall() { + // By the time we receive this intent, we could be shut down and call list + // could be null. Bail in those cases. + if (mCallList == null) { + return; + } + Call call = mCallList.getOutgoingCall(); if (call == null) { call = mCallList.getActiveOrBackgroundCall(); |