diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-22 07:13:40 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-22 07:13:40 -0700 |
commit | 36835138ac3bb3a167b0950a929788aee6d9fb7e (patch) | |
tree | 3f54606161a413177e1d4a6d92915a054f816608 | |
parent | ee43a088fd06e8b2788380253b5f6591280e6334 (diff) | |
parent | 668336bab72881473af5e36046fa992048ebe3a1 (diff) | |
download | android_packages_apps_Dialer-36835138ac3bb3a167b0950a929788aee6d9fb7e.tar.gz android_packages_apps_Dialer-36835138ac3bb3a167b0950a929788aee6d9fb7e.tar.bz2 android_packages_apps_Dialer-36835138ac3bb3a167b0950a929788aee6d9fb7e.zip |
Merge "IMS-VT: Use original dialed string instead of normalized dial string"
-rw-r--r-- | src/com/android/dialer/list/SearchFragment.java | 23 |
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; } |