summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorSamyeoul Choi <sy310.choi@samsung.com>2011-02-25 12:08:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-25 12:08:08 -0800
commit6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf (patch)
treee94ad7555d660eaad0e70fdfe7deaedb17eadd73 /telephony
parent66edf2bb3ffc6e03d942cdc94f1ca2daf5e64167 (diff)
parent092238916fd5d10090c0bcad33644778a1f366e7 (diff)
downloadframeworks_base-6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf.zip
frameworks_base-6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf.tar.gz
frameworks_base-6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf.tar.bz2
am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '092238916fd5d10090c0bcad33644778a1f366e7': 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 0865d6f..3890a98 100755
--- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
@@ -737,7 +737,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;
}