diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-01-09 01:54:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-09 01:54:48 +0000 |
| commit | df51476c019c1e0dc765d247b6a8839defabc5db (patch) | |
| tree | 98f6d7f8bf011f9175c92057ce53135ac18cfde6 | |
| parent | f7219658e122e8134ec6c284d585b490700121b0 (diff) | |
| parent | cbe7187d72f1500b5441f2f028eeb5681df6b376 (diff) | |
am 00dec2c8: am 25c3e808: Merge "Fixing Null Pointer exception due to uninitialized view reference." into lmp-mr1-dev
* commit '00dec2c8c8a052b6ad9d358e884a5008b5b27d7f':
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); } } |