diff options
| author | Richard MacGregor <rmacgregor@cyngn.com> | 2016-04-15 08:22:02 -0700 |
|---|---|---|
| committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-04-18 11:58:57 -0700 |
| commit | 581e03b1702ac21881ca64a6e2390d851a3e4c01 (patch) | |
| tree | ac22255e1497ddde2106c93acfa9965debd9491b | |
| parent | 3fb7eeb04dd17b8357929d2454e46043142e8865 (diff) | |
| download | android_packages_apps_Dialer-581e03b1702ac21881ca64a6e2390d851a3e4c01.tar.gz android_packages_apps_Dialer-581e03b1702ac21881ca64a6e2390d851a3e4c01.tar.bz2 android_packages_apps_Dialer-581e03b1702ac21881ca64a6e2390d851a3e4c01.zip | |
Dialer NPE - Search Results
Check of CallMethodInfo is null before trying to use it.
Ticket CD-541
Change-Id: Id480fc7c039c970acb199dd066c1ef388a2be8ee
| -rw-r--r-- | src/com/android/dialer/list/SearchFragment.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java index 484969e12..bd857387a 100644 --- a/src/com/android/dialer/list/SearchFragment.java +++ b/src/com/android/dialer/list/SearchFragment.java @@ -296,22 +296,25 @@ public class SearchFragment extends PhoneNumberPickerFragment final OnPhoneNumberPickerActionListener listener; final Intent intent; final String number; + CallMethodInfo currentCallMethod = getCurrentCallMethod(); Log.i(TAG, "onItemClick: shortcutType=" + shortcutType); switch (shortcutType) { case DialerPhoneNumberListAdapter.SHORTCUT_INVALID: number = adapter.getQueryString(); - if (getCurrentCallMethod().mIsInCallProvider && !PhoneNumberUtils.isEmergencyNumber(number)) { - onProviderClick(position, getCurrentCallMethod()); + if (currentCallMethod != null && currentCallMethod.mIsInCallProvider && + !PhoneNumberUtils.isEmergencyNumber(number)) { + onProviderClick(position, currentCallMethod); } else { super.onItemClick(position, id); } break; case DialerPhoneNumberListAdapter.SHORTCUT_DIRECT_CALL: number = adapter.getQueryString(); - if (getCurrentCallMethod().mIsInCallProvider && !PhoneNumberUtils.isEmergencyNumber(number)) { - placePSTNCall(number, getCurrentCallMethod()); + if (currentCallMethod != null && currentCallMethod.mIsInCallProvider && + !PhoneNumberUtils.isEmergencyNumber(number)) { + placePSTNCall(number, currentCallMethod); } else { listener = getOnPhoneNumberPickerListener(); if (listener != null && !checkForProhibitedPhoneNumber(number)) { |