diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-01-08 23:42:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-08 23:42:09 +0000 |
| commit | e9a89b276628770d80bbd7d92cc6b38b1384e3a8 (patch) | |
| tree | 7906d31c4e68036c658d254241db616e7bd85431 | |
| parent | 9ad88c9f1417d5b0dcfa270e916692f11aecc0b5 (diff) | |
| parent | f7fda6fe636d18a42cf5faac9166a1096e910fd0 (diff) | |
Merge "Fixing Null Pointer exception due to uninitialized view reference." into lmp-mr1-dev
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 75d995f4c..81b9ff78c 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -736,11 +736,12 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mSecondaryCallName = (TextView) getView().findViewById(R.id.secondaryCallName); mSecondaryCallConferenceCallIcon = getView().findViewById(R.id.secondaryCallConferenceCallIcon); - if (hasProvider) { - mSecondaryCallProviderInfo.setVisibility(View.VISIBLE); - mSecondaryCallProviderLabel = (TextView) getView() - .findViewById(R.id.secondaryCallProviderLabel); - } + } + + if (mSecondaryCallProviderLabel == null && hasProvider) { + mSecondaryCallProviderInfo.setVisibility(View.VISIBLE); + mSecondaryCallProviderLabel = (TextView) getView() + .findViewById(R.id.secondaryCallProviderLabel); } } |