diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-05-08 10:07:23 -0700 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2015-05-08 10:07:51 -0700 |
| commit | 85f7ca6523ee19fa2537db4cd259ad69654c346a (patch) | |
| tree | 72ee343c85646ffebad6e5866aaa88b59ad710ec /InCallUI | |
| parent | ed8488149b8d842ee86b4c209d0f39d71f004146 (diff) | |
Fix NPE when hitting back in InCallActivity
Bug: 20921372
Change-Id: I25969a56eb293f20e3dfeaccf6f929177da00e85
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index 5ecb96e3f..bae343649 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -357,7 +357,7 @@ public class InCallActivity extends Activity implements FragmentDisplayManager { // in-call UI: if ((mConferenceManagerFragment == null || !mConferenceManagerFragment.isVisible()) - && !mCallCardFragment.isVisible()) { + && (mCallCardFragment == null || !mCallCardFragment.isVisible())) { return; } |