diff options
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 9762d77e2f35..09e282032eb9 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -377,4 +377,7 @@ <!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD --> <string-array name="config_twoDigitNumberPattern"> </string-array> + + <!-- The VoiceMail default value is displayed to my own number if it is true --> + <bool name="config_telephony_use_own_number_for_voicemail">false</bool> </resources> diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java index 249b0503c3af..c11dd0b2f825 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java +++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java @@ -730,7 +730,14 @@ public class CDMAPhone extends PhoneBase { String number = null; SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext()); // TODO: The default value of voicemail number should be read from a system property - number = sp.getString(VM_NUMBER_CDMA, "*86"); + + // Read platform settings for dynamic voicemail number + if (getContext().getResources().getBoolean(com.android.internal + .R.bool.config_telephony_use_own_number_for_voicemail)) { + number = sp.getString(VM_NUMBER_CDMA, getLine1Number()); + } else { + number = sp.getString(VM_NUMBER_CDMA, "*86"); + } return number; } |