diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-05-08 17:13:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 17:15:35 +0000 |
| commit | 49192ceff2a79b2a75ffdcabaa460cd753972d26 (patch) | |
| tree | 8ed09310b352575b1402f9f852a730f75656a2ac /InCallUI | |
| parent | 151b2e1e490986379b572d932756c3a2089df49e (diff) | |
| parent | 85f7ca6523ee19fa2537db4cd259ad69654c346a (diff) | |
Merge "Fix NPE when hitting back in InCallActivity" into mnc-dev
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 e8a632cd9..289bf6388 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -381,7 +381,7 @@ public class InCallActivity extends Activity implements FragmentDisplayManager { // in-call UI: if ((mConferenceManagerFragment == null || !mConferenceManagerFragment.isVisible()) - && !mCallCardFragment.isVisible()) { + && (mCallCardFragment == null || !mCallCardFragment.isVisible())) { return; } |