From 8be68867cd328911a440eec2ba53f52f80aa28c6 Mon Sep 17 00:00:00 2001 From: maxwelb Date: Tue, 3 Apr 2018 13:34:47 -0700 Subject: Fix NPE for details number The phone number can be null in the call log (typically for conference calls), but this wasn't handled properly for calls from non-contacts. This CL fixes the issue by instead using the display number. PhoneNumberUtils properly handles null values and can parse the formatted version. Bug: 77486039 Test: manual :/ PiperOrigin-RevId: 191492307 Change-Id: I1be427b3f4ed1381bea3943d130256618f730f5d --- java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/com/android/dialer/app') diff --git a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java index 680424a78..bca4265b6 100644 --- a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java +++ b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java @@ -279,7 +279,7 @@ public class PhoneCallDetailsHelper return; } - if (PhoneNumberUtils.isEmergencyNumber(details.number.toString())) { + if (PhoneNumberUtils.isEmergencyNumber(details.displayNumber)) { views.nameView.setText(R.string.emergency_number); views.nameView.setTextDirection(View.TEXT_DIRECTION_INHERIT); return; -- cgit v1.2.3