diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-04-17 21:26:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-17 21:26:21 +0000 |
| commit | f2004061505cdcb2a37072b430104586ca848df2 (patch) | |
| tree | 331dbd131da43ba19a371755a3c22af40df51967 | |
| parent | 9d4efdf2802f06ccf7031610891f75af70ea5538 (diff) | |
| parent | 2850d7a5996aaccc675a917cfec61f5ba55845d7 (diff) | |
| download | frameworks_base-f2004061505cdcb2a37072b430104586ca848df2.zip frameworks_base-f2004061505cdcb2a37072b430104586ca848df2.tar.gz frameworks_base-f2004061505cdcb2a37072b430104586ca848df2.tar.bz2 | |
Merge "Set default values for VVM constants in CarrierConfigManager"
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 34a9905..be9e22e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32719,10 +32719,6 @@ package android.telephony { field public static final java.lang.String BOOL_CARRIER_VOLTE_TTY_SUPPORTED = "bool_carrier_volte_tty_supported"; field public static final java.lang.String BOOL_SHOW_APN_SETTING_CDMA = "bool_show_apn_setting_cdma"; field public static final java.lang.String INT_VOLTE_REPLACEMENT_RAT = "int_volte_replacement_rat"; - field public static final java.lang.String SHORT_VVM_PORT_NUMBER = "string_vvm_port_number"; - field public static final java.lang.String STRING_VVM_DESTINATION_NUMBER = "string_vvm_destination_number"; - field public static final java.lang.String STRING_VVM_TYPE = "string_vvm_type"; - field public static final java.lang.String VVM_TYPE_OMTP = "vvm_type_omtp"; } public final class CellIdentityCdma implements android.os.Parcelable { diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index b1fb3a6..d103fbf 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -85,7 +85,6 @@ public class CarrierConfigManager { * * @hide */ - @SystemApi public static final String STRING_VVM_DESTINATION_NUMBER = "string_vvm_destination_number"; /** @@ -93,15 +92,13 @@ public class CarrierConfigManager { * * @hide */ - @SystemApi - public static final String SHORT_VVM_PORT_NUMBER = "string_vvm_port_number"; + public static final String INT_VVM_PORT_NUMBER = "int_vvm_port_number"; /** * The type of visual voicemail protocol the carrier adheres to (see below). * * @hide */ - @SystemApi public static final String STRING_VVM_TYPE = "string_vvm_type"; /* Visual voicemail protocols */ @@ -111,7 +108,6 @@ public class CarrierConfigManager { * * @hide */ - @SystemApi public static final String VVM_TYPE_OMTP = "vvm_type_omtp"; private final static String TAG = "CarrierConfigManager"; @@ -127,6 +123,10 @@ public class CarrierConfigManager { sDefaults.putBoolean(BOOL_SHOW_APN_SETTING_CDMA, false); sDefaults.putInt(INT_VOLTE_REPLACEMENT_RAT, 0); + + sDefaults.putString(STRING_VVM_DESTINATION_NUMBER, ""); + sDefaults.putString(STRING_VVM_TYPE, ""); + sDefaults.putInt(INT_VVM_PORT_NUMBER, 0); } /** |