summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorSamyeoul Choi <sy310.choi@samsung.com>2011-02-25 12:51:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-25 12:51:51 -0800
commit350799b72c3180e04ec91469509f6079c932b971 (patch)
tree9914880a733f01fa3512b4ae340c7a4a88152f68 /telephony
parentdc365a36dac50bccc1411c37839513daec56d335 (diff)
parent6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf (diff)
downloadframeworks_base-350799b72c3180e04ec91469509f6079c932b971.zip
frameworks_base-350799b72c3180e04ec91469509f6079c932b971.tar.gz
frameworks_base-350799b72c3180e04ec91469509f6079c932b971.tar.bz2
am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf': Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
Diffstat (limited to 'telephony')
-rwxr-xr-xtelephony/java/com/android/internal/telephony/cdma/CDMAPhone.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
index bd00a0b..f5aaea2 100755
--- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
@@ -725,7 +725,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;
}