Fix bug that "+" is dropped when performing actions in smart dial search.

This is caused by normalizing numbers from dialpad search into search box, while "add new contacts" and "send sms" etc. wouldn't work properly without full number.
This change also fix "send sms" in old search fragment.

This change includes upstream change from:
https://android-review.googlesource.com/#/c/platform/packages/apps/Dialer/+/530377/

Change address format when sending message from smart dial

In Android O, send search key number as address to message app.
In Android N, send real input number as address to message app.
Fixed the issue by reverting to Android N implementation.

Affected Area:
 Send SMS operation from Dialer smart dial search result list.

Bug: 68962106
Test: manual
PiperOrigin-RevId: 175317850
Change-Id: I96dd576144f93f7502977bfdb4b9e9d9c8f73526

1 files changed, 4 insertions, 1 deletions

diff --git a/java/com/android/dialer/app/list/SearchFragment.java b/java/com/android/dialer/app/list/SearchFragment.java
index e21e073bd..9330fc8c7 100644
--- a/java/com/android/dialer/app/list/SearchFragment.java
+++ b/java/com/android/dialer/app/list/SearchFragment.java
@@ -261,7 +261,10 @@ public class SearchFragment extends PhoneNumberPickerFragment {
             getActivity(), intent, R.string.add_contact_not_available);
         break;
       case DialerPhoneNumberListAdapter.SHORTCUT_SEND_SMS_MESSAGE:
-        number = adapter.getFormattedQueryString();
+        number =
+            TextUtils.isEmpty(mAddToContactNumber)
+                ? adapter.getFormattedQueryString()
+                : mAddToContactNumber;
         intent = IntentUtil.getSendSmsIntent(number);
         DialerUtils.startActivityWithErrorToast(getActivity(), intent);
         break;