IMS-VT: Use original dialed string instead of normalized dial string

- The smart dial search normalizes the dial string and removes
  anything other than digits
- Pass original dialed string instead of normalized dial string
  to fix this issue.
- Original dial string contains the number which is actully entered
  by user. Pass this number as it is as dialed number validation is
  already taken care by APIs defined in PhoneNumberUtils.

Change-Id: Ib85750abef765ace127ebde3a13397b4dfad48fa
CRs-Fixed: 806046

1 files changed, 3 insertions, 20 deletions

diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java
index 4603d0359..70141a73a 100644
--- a/src/com/android/dialer/list/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -142,22 +142,6 @@ public class SearchFragment extends PhoneNumberPickerFragment {
     }
 
     /**
-     * Adds a plus sign to the query string if original typed number was an international number.
-     */
-    private String addPlusSignPrefixToNumber(String actualNumber) {
-        final StringBuilder number = new StringBuilder();
-
-        // Check if actual number had + sign as the first character and query string does not, then
-        // return a number with a + sign prefixed to the query string. That will be the dial string.
-        if ((actualNumber != null) && actualNumber.startsWith("+") && (getQueryString() != null)
-                && !(getQueryString().startsWith("+"))) {
-            number.append('+');
-        }
-        number.append(getQueryString());
-        return number.toString();
-    }
-
-    /**
      * Return true if phone number is prohibited by a value -
      * (R.string.config_prohibited_phone_number_regexp) in the config files. False otherwise.
      */
@@ -197,8 +181,7 @@ public class SearchFragment extends PhoneNumberPickerFragment {
         final int shortcutType = adapter.getShortcutTypeFromPosition(position);
         final OnPhoneNumberPickerActionListener listener;
 
-        String dialingNumber = addPlusSignPrefixToNumber(mAddToContactNumber);
-        boolean ret = checkForProhibitedPhoneNumber(dialingNumber);
+        boolean ret = checkForProhibitedPhoneNumber(mAddToContactNumber);
 
         switch (shortcutType) {
             case DialerPhoneNumberListAdapter.SHORTCUT_INVALID:
@@ -207,7 +190,7 @@ public class SearchFragment extends PhoneNumberPickerFragment {
             case DialerPhoneNumberListAdapter.SHORTCUT_DIRECT_CALL:
                 listener = getOnPhoneNumberPickerListener();
                 if (listener != null && !ret) {
-                    listener.onCallNumberDirectly(dialingNumber);
+                    listener.onCallNumberDirectly(getQueryString());
                 }
                 break;
             case DialerPhoneNumberListAdapter.SHORTCUT_ADD_NUMBER_TO_CONTACTS:
@@ -220,7 +203,7 @@ public class SearchFragment extends PhoneNumberPickerFragment {
             case DialerPhoneNumberListAdapter.SHORTCUT_MAKE_VIDEO_CALL:
                 listener = getOnPhoneNumberPickerListener();
                 if (listener != null && !ret) {
-                    listener.onCallNumberDirectly(dialingNumber, true /* isVideoCall */);
+                    listener.onCallNumberDirectly(mAddToContactNumber, true /* isVideoCall */);
                 }
                 break;
         }