diff options
author | Michael W <baddaemon87@gmail.com> | 2018-04-21 15:31:14 +0200 |
---|---|---|
committer | Michael W <baddaemon87@gmail.com> | 2018-05-08 12:59:43 +0200 |
commit | d4a6cea1519ff3ee8375c45d972589a235841b35 (patch) | |
tree | 0b13465ef74fea1bbccb807c1d6ae6d7fe267a02 | |
parent | 8d2b1b00a3acb5f73146c57b5fe5990ce6bbed73 (diff) | |
download | android_packages_apps_Dialer-d4a6cea1519ff3ee8375c45d972589a235841b35.tar.gz android_packages_apps_Dialer-d4a6cea1519ff3ee8375c45d972589a235841b35.tar.bz2 android_packages_apps_Dialer-d4a6cea1519ff3ee8375c45d972589a235841b35.zip |
Dialer: Fix possible NPE
* In some cases with VVM involved, the phone number seems to be null,
resulting in a NPE when trying to split it by the regex
* Make sure there is always a valid string involved to prevent the error
BUGBASH-1447, BUGBASH-1242
Change-Id: I88302deeaeb3e085190fdab5fa7d2a8030bceb88
-rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 6a447a667..65aad9b2a 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -507,7 +507,10 @@ public class CallLogAdapter extends GroupingListAdapter } int count = getGroupSize(position); - final String phoneNumber = c.getString(CallLogQuery.NUMBER); + String phoneNumber = c.getString(CallLogQuery.NUMBER); + if (phoneNumber == null) { + phoneNumber = ""; + } Pattern pattern = Pattern.compile("[,;]"); String[] num = pattern.split(phoneNumber); final String countryIso = c.getString(CallLogQuery.COUNTRY_ISO); |