commit c5bf9ba6e7e69ccd1cac2edc3e27198481b0fba2
author Jay Shrauner <shrauner@google.com> Tue Dec 08 23:00:21 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 08 23:00:21 2015 +0000
tree 5cca451d029e80267ff1df7ff215fd17c6c95323
parent d912e40f72699698b7d2b34a77abe86940f8318a
parent b4bcb72539dc7982190357b5bc950c2b41d2a9db

Fix NPE in matchesNumber
am: b4bcb72539

* commit 'b4bcb72539dc7982190357b5bc950c2b41d2a9db':
  Fix NPE in matchesNumber

src/com/android/dialer/dialpad/SmartDialNameMatcher.java

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();