Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set default values for VVM constants in CarrierConfigManager"

Browse Source
This commit is contained in:
Yorke Lee
2015-04-17 21:26:20 +00:00
committed by Android (Google) Code Review
parent 9d4efdf280 2850d7a599
commit f200406150
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -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 {

10
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -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);
}
/**