Fix NPE in matchesNumber
Check for null phoneNumber
Bug:25973238
Change-Id: I019bf4be0598896a8f4a93f5331d98f78f98b786
diff --git a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
index 0126864..a54fe16 100644
--- a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
+++ b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
@@ -16,6 +16,7 @@
package com.android.dialer.dialpad;
+import android.support.annotation.Nullable;
import android.text.TextUtils;
import com.android.dialer.dialpad.SmartDialPrefix.PhoneNumberTokens;
@@ -123,7 +124,11 @@
* SmartDialMatchPosition with the matching positions otherwise
*/
@VisibleForTesting
+ @Nullable
public SmartDialMatchPosition matchesNumber(String phoneNumber, String query, boolean useNanp) {
+ if (TextUtils.isEmpty(phoneNumber)) {
+ return null;
+ }
StringBuilder builder = new StringBuilder();
constructEmptyMask(builder, phoneNumber.length());
mPhoneNumberMatchMask = builder.toString();