commit 49192ceff2a79b2a75ffdcabaa460cd753972d26
author Yorke Lee <yorkelee@google.com> Fri May 08 17:13:10 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 08 17:15:35 2015 +0000
tree 8ed09310b352575b1402f9f852a730f75656a2ac
parent 151b2e1e490986379b572d932756c3a2089df49e
parent 85f7ca6523ee19fa2537db4cd259ad69654c346a

Merge "Fix NPE when hitting back in InCallActivity" into mnc-dev

InCallUI/src/com/android/incallui/InCallActivity.java

diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index e8a632c..289bf63 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -381,7 +381,7 @@
         // in-call UI:
 
         if ((mConferenceManagerFragment == null || !mConferenceManagerFragment.isVisible())
-                && !mCallCardFragment.isVisible()) {
+                && (mCallCardFragment == null || !mCallCardFragment.isVisible())) {
             return;
         }