From f3291fb8739679a84257f8574c61331af070970f Mon Sep 17 00:00:00 2001 From: twyen Date: Fri, 18 May 2018 15:19:50 -0700 Subject: Fix video call from search stripping + prefix The smart dial normalization remove non-digits, so the raw number must be set. TEST=TAP Bug: 79400183 Test: TAP PiperOrigin-RevId: 197208475 Change-Id: I303f1b19c30f11303066750f7a830f33ab79ce4f --- java/com/android/dialer/main/impl/MainSearchController.java | 7 ++++--- java/com/android/dialer/searchfragment/list/NewSearchFragment.java | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'java') diff --git a/java/com/android/dialer/main/impl/MainSearchController.java b/java/com/android/dialer/main/impl/MainSearchController.java index fc4fc3dcb..945e8a948 100644 --- a/java/com/android/dialer/main/impl/MainSearchController.java +++ b/java/com/android/dialer/main/impl/MainSearchController.java @@ -444,11 +444,12 @@ public class MainSearchController implements SearchBarListener { /** @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 diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java index abb3aecd4..5417fcf8c 100644 --- a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java +++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java @@ -251,6 +251,11 @@ public final class NewSearchFragment extends Fragment this.rawNumber = rawNumber; } + @VisibleForTesting + public String getRawNumber() { + return rawNumber; + } + public void setQuery(String query, CallInitiationType.Type callInitiationType) { this.query = query; this.callInitiationType = callInitiationType; -- cgit v1.2.3