diff options
| author | Samyeoul Choi <sy310.choi@samsung.com> | 2011-02-25 12:55:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-25 12:55:35 -0800 |
| commit | 4b7c6fa2c0707b7e5b451b31de8a113e945c8e09 (patch) | |
| tree | 90d39677a6b49cc7a7a2d542bf24f9441e2f61d9 | |
| parent | bc006dc0aa1c149508a3196a40bac62cf1b33b84 (diff) | |
| parent | 350799b72c3180e04ec91469509f6079c932b971 (diff) | |
| download | frameworks_base-4b7c6fa2c0707b7e5b451b31de8a113e945c8e09.zip frameworks_base-4b7c6fa2c0707b7e5b451b31de8a113e945c8e09.tar.gz frameworks_base-4b7c6fa2c0707b7e5b451b31de8a113e945c8e09.tar.bz2 | |
am 350799b7: am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '350799b72c3180e04ec91469509f6079c932b971':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
| -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 0aff385..cb44a3a 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -571,4 +571,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 459d827..2c7243e 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java +++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java @@ -740,7 +740,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; } |