commit bab3b1069336e31048bfcde7a4e665007cfded5a
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 18 23:59:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 18 23:59:21 2018 +0000
tree f5ded8c30d282e6d02aca725e7949b9ac58f3523
parent 5f3a727a922ed9ebeaaa64b3d40353576cad09f6
parent f3291fb8739679a84257f8574c61331af070970f

Merge "Fix video call from search stripping + prefix"

java/com/android/dialer/main/impl/MainSearchController.java

diff --git a/java/com/android/dialer/main/impl/MainSearchController.java b/java/com/android/dialer/main/impl/MainSearchController.java
index fc4fc3d..945e8a9 100644
--- a/java/com/android/dialer/main/impl/MainSearchController.java
+++ b/java/com/android/dialer/main/impl/MainSearchController.java
@@ -444,11 +444,12 @@
 
   /** @see OnDialpadQueryChangedListener#onDialpadQueryChanged(java.lang.String) */
   public void onDialpadQueryChanged(String query) {
-    query = SmartDialNameMatcher.normalizeNumber(/* context = */ activity, query);
+    String normalizedQuery = SmartDialNameMatcher.normalizeNumber(/* context = */ activity, query);
     if (searchFragment != null) {
-      searchFragment.setQuery(query, CallInitiationType.Type.DIALPAD);
+      searchFragment.setRawNumber(query);
+      searchFragment.setQuery(normalizedQuery, CallInitiationType.Type.DIALPAD);
     }
-    dialpadFragment.process_quote_emergency_unquote(query);
+    dialpadFragment.process_quote_emergency_unquote(normalizedQuery);
   }
 
   @Override

java/com/android/dialer/searchfragment/list/NewSearchFragment.java

diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
index abb3aec..5417fcf 100644
--- a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
+++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
@@ -251,6 +251,11 @@
     this.rawNumber = rawNumber;
   }
 
+  @VisibleForTesting
+  public String getRawNumber() {
+    return rawNumber;
+  }
+
   public void setQuery(String query, CallInitiationType.Type callInitiationType) {
     this.query = query;
     this.callInitiationType = callInitiationType;