commit cb206d50e12faac1455f2f44451c5041af2aa0a8
author Li Wei <liwei@codeaurora.org> Mon Feb 06 11:29:00 2017 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Feb 12 19:10:45 2017 -0800
tree aebd10fe70821f0f03ab2ad434fa4a597bdacc87
parent 3bdf5cdf77c3da914048984ae5e7d006f7c2c440

Dialer: Fix FC due to StringIndexOutOfBoundsException of builder

-Add builder.length conditon to avoid StringIndexOutOfBoundsException.

CRs-Fixed: 1103354
Change-Id: I252b6cfbf4b4b7a947a4ea6de497445cbf911dc0

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 f82dbf8..1c18206 100644
--- a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
+++ b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
@@ -476,7 +476,7 @@
         for (int i = 0; i < indexs.length; i = i + 2) {
             int start = indexs[i];
             int end = indexs[i + 1];
-            if (start >= 0 && end >= 0) {
+            if (start >= 0 && end >= 0 && start < builder.length() - 1 && end < builder.length()) {
                 matchList.add(new SmartDialMatchPosition(start, end + 1));
             } else {
                 Log.d(TAG, "Invalid index, start is:" + start + " end is:"