commit 5d7e9d6356fe23fabf4aa5e97eda889668af7c21
author Devci Telephony <devci-telephony@localhost> Thu Feb 09 13:25:31 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Feb 09 13:25:31 2017 -0800
tree f0229753fe050b1ab79ff8c96ac866b276b7aa8e
parent 50ca6aa636700208339cf45b53e067d5bab34917
parent 8e2b803aa1ad1bcc0988caaaa51cf54a5b4878fc

Merge "Dialer: The call contact name still show after deleting contact" into atel.lnx.2.0-dev

InCallUI/src/com/android/incallui/InCallPresenter.java

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 5a5d0cb..2a1ecab 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -729,7 +729,9 @@
         if (CallList.getInstance().isDsdaEnabled() && (mInCallActivity != null)) {
             mInCallActivity.updateDsdaTab();
         }
-        wakeUpScreen();
+        if (isActivityStarted()) {
+            wakeUpScreen();
+        }
     }
 
     @Override

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:"