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 | 25c3e808b91061e71d4cb1d1eccb0bc6beeb93a7 (patch) | |
| tree | d3acdc263ace3310016ecdcec9d6c2be094939b0 | |
| parent | 2759ccbab2a37043123171425e211372ec452465 (diff) | |
| parent | fec0d0b784d3b93ae91577d00ba411d26916875a (diff) | |
| download | packages_apps_InCallUI-25c3e808b91061e71d4cb1d1eccb0bc6beeb93a7.tar.gz packages_apps_InCallUI-25c3e808b91061e71d4cb1d1eccb0bc6beeb93a7.tar.bz2 packages_apps_InCallUI-25c3e808b91061e71d4cb1d1eccb0bc6beeb93a7.zip | |
Merge "Fixing Null Pointer exception due to uninitialized view reference." into lmp-mr1-dev
| -rw-r--r-- | src/com/android/incallui/CallCardFragment.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java index 75d995f4..81b9ff78 100644 --- a/src/com/android/incallui/CallCardFragment.java +++ b/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); } } |