summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2014-09-09 16:30:29 -0700
committerEthan Chen <intervigil@gmail.com>2014-09-09 16:33:44 -0700
commitd8ebf219d7716a9da16abc2bad9e5cb5c12e1d56 (patch)
tree2ab3adfb20c48dd1589be1784b1932b6e64d323f
parentcd886c5027400abbcc830d0cb5ec75075d6fd79e (diff)
downloadandroid_packages_apps_Dialer-d8ebf219d7716a9da16abc2bad9e5cb5c12e1d56.tar.gz
android_packages_apps_Dialer-d8ebf219d7716a9da16abc2bad9e5cb5c12e1d56.tar.bz2
android_packages_apps_Dialer-d8ebf219d7716a9da16abc2bad9e5cb5c12e1d56.zip
Fix call stats NPE
* There is already code to handle the case where thirdIntent is null without potentially derefering a null UI element. Use it. Change-Id: I51e373d8108ba50f3843b42d188f2ad26ca3fb60
-rw-r--r--src/com/android/dialer/CallDetailHeader.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/dialer/CallDetailHeader.java b/src/com/android/dialer/CallDetailHeader.java
index 45e649600..50846022c 100644
--- a/src/com/android/dialer/CallDetailHeader.java
+++ b/src/com/android/dialer/CallDetailHeader.java
@@ -511,13 +511,13 @@ public class CallDetailHeader {
}
text.setText(entry.text);
- if(entry.thirdIntent != null) {
+ if (entry.thirdIntent != null) {
icon_third.setOnClickListener(mThirdActionListener);
icon_third.setImageResource(R.drawable.ic_contact_quick_contact_call_video_holo_dark);
icon_third.setTag(entry);
icon_third.setContentDescription(entry.thirdDescription);
+ icon_third.setVisibility(View.VISIBLE);
}
- icon_third.setVisibility(entry.thirdIntent != null? View.VISIBLE : View.GONE);
TextView label = (TextView) convertView.findViewById(R.id.call_and_sms_label);
if (TextUtils.isEmpty(entry.label)) {