Merge "Fix possible NPEs in CallCardPresenter" into lmp-dev

1 files changed, 2 insertions, 3 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index c37aaec73..1335766b0 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -469,7 +469,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
         }
 
         final boolean isGenericConf = isGenericConference(mPrimary);
-        if (entry != null) {
+        if (entry != null && mPrimary != null) {
             final String name = getNameForCall(entry);
             final String number = getNumberForCall(entry);
             final boolean nameIsNumber = name != null && name.equals(entry.number);
@@ -482,14 +482,13 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
     }
 
     private void updateSecondaryDisplayInfo(boolean isConference) {
-
         final CallCardUi ui = getUi();
         if (ui == null) {
             return;
         }
 
         final boolean isGenericConf = isGenericConference(mSecondary);
-        if (mSecondaryContactInfo != null) {
+        if (mSecondaryContactInfo != null && mSecondary != null) {
             Log.d(TAG, "updateSecondaryDisplayInfo() " + mSecondaryContactInfo);
             final String nameForCall = getNameForCall(mSecondaryContactInfo);