diff options
author | Yorke Lee <yorkelee@google.com> | 2014-08-28 21:39:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-28 21:39:23 +0000 |
commit | 1170e90b17e64ffb71a2753b834667b233f636c0 (patch) | |
tree | 796708b3007d2706a0e099c79fbce7c3136bad7c /InCallUI | |
parent | e0a079f783b032d774730688ee5128b030555256 (diff) | |
parent | 8ecbbb5ec14c797fdc3834f3c7d30a0e14edcaf9 (diff) |
Merge "Fix possible NPEs in CallCardPresenter" into lmp-dev
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 5 |
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); |