diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-03-31 12:43:50 -0700 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2015-03-31 12:43:50 -0700 |
| commit | 07149bc8df71c26e3eee8a37ee7974ce634e752e (patch) | |
| tree | 0e38d82da103cdf2026b85fa397cf36e49a8d5f3 | |
| parent | 1143f3077c8d1d7ca3ff162723d75ead0a3f780e (diff) | |
Fix NPE if InCallActivity is finished before call card is displayed
Bug: 20001311
Change-Id: I8c6994062065da55d6e37652d9a6c8e5985c5f7a
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index 5a572d583..4f0cc3d93 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -180,7 +180,8 @@ public class InCallActivity extends Activity implements FragmentDisplayManager { @Override protected void onSaveInstanceState(Bundle out) { // TODO: The dialpad fragment should handle this as part of its own state - out.putBoolean(SHOW_DIALPAD_EXTRA, mCallButtonFragment.isDialpadVisible()); + out.putBoolean(SHOW_DIALPAD_EXTRA, + mCallButtonFragment != null && mCallButtonFragment.isDialpadVisible()); if (mDialpadFragment != null) { out.putString(DIALPAD_TEXT_EXTRA, mDialpadFragment.getDtmfText()); } |