diff options
| -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(); |