summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-04-17 13:55:56 -0700
committerYorke Lee <yorkelee@google.com>2015-04-17 14:24:20 -0700
commit2850d7a5996aaccc675a917cfec61f5ba55845d7 (patch)
tree0706454a89723e711d13ac2624e2d5565c44a8c4 /telephony
parente354f5d5806c1566761e03fbdf5a46a723d6ebd3 (diff)
downloadframeworks_base-2850d7a5996aaccc675a917cfec61f5ba55845d7.zip
frameworks_base-2850d7a5996aaccc675a917cfec61f5ba55845d7.tar.gz
frameworks_base-2850d7a5996aaccc675a917cfec61f5ba55845d7.tar.bz2
Set default values for VVM constants in CarrierConfigManager
* Also hide the constants, they don't need to be @SystemApi * Make VVM_PORT_NUMBER an Int Bug: 20272209 Change-Id: I0d47afd7916d40f77ba5bf8e95306b46b27c15b3
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java10
1 files changed, 5 insertions, 5 deletions
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);
}
/**