diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-01-09 01:59:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-09 01:59:08 +0000 |
| commit | 8a8558b3aec185913471917a1fdab80fbb64b3c6 (patch) | |
| tree | 3bfa4f8df666b9b1d96a7e2b03f0cff2c6dd2e7c | |
| parent | 525d9a3abcf98beebc94609a868e224d82215d32 (diff) | |
| parent | df51476c019c1e0dc765d247b6a8839defabc5db (diff) | |
am 2214a6e8: am 00dec2c8: am 25c3e808: Merge "Fixing Null Pointer exception due to uninitialized view reference." into lmp-mr1-dev
* commit '2214a6e86e9ab6f368edd5b7b910bdb5040a8019':
Fixing Null Pointer exception due to uninitialized view reference.
| -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); } } |