Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev (8431a48f) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -36834,10 +36834,10 @@ package android.telephony {
		field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";
		field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";
		field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";
		field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN = "vvm_cellular_data_required";
		field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required";
		field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";
		field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int";
		field public static final java.lang.String KEY_VVM_PREFETCH_BOOLEAN = "vvm_prefetch";
		field public static final java.lang.String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch";
		field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string";
		field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
		}

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -39782,10 +39782,10 @@ package android.telephony {
		field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";
		field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";
		field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";
		field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN = "vvm_cellular_data_required";
		field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required";
		field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";
		field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int";
		field public static final java.lang.String KEY_VVM_PREFETCH_BOOLEAN = "vvm_prefetch";
		field public static final java.lang.String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch";
		field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string";
		field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
		}

api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -36909,10 +36909,10 @@ package android.telephony {
		field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";
		field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";
		field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";
		field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN = "vvm_cellular_data_required";
		field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required";
		field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";
		field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int";
		field public static final java.lang.String KEY_VVM_PREFETCH_BOOLEAN = "vvm_prefetch";
		field public static final java.lang.String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch";
		field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string";
		field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
		}

telephony/java/android/telephony/CarrierConfigManager.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package android.telephony;

		import com.android.internal.telephony.ICarrierConfigLoader;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		@@ -26,6 +24,8 @@ import android.os.PersistableBundle;
		import android.os.RemoteException;
		import android.os.ServiceManager;

		import com.android.internal.telephony.ICarrierConfigLoader;

		/**
		* Provides access to telephony configuration values that are carrier-specific.
		* <p>
		@@ -454,12 +454,12 @@ public class CarrierConfigManager {
		/**
		* Whether cellular data is required to access visual voicemail.
		*/
		public static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN = "vvm_cellular_data_required";
		public static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required";

		/**
		* Whether to prefetch audio data on new voicemail arrival, defaulted to true.
		*/
		public static final String KEY_VVM_PREFETCH_BOOLEAN = "vvm_prefetch";
		public static final String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch";

		/**
		* The package name of the carrier's visual voicemail app to ensure that dialer visual voicemail
		@@ -735,8 +735,8 @@ public class CarrierConfigManager {
		sDefaults.putString(KEY_VVM_DESTINATION_NUMBER_STRING, "");
		sDefaults.putInt(KEY_VVM_PORT_NUMBER_INT, 0);
		sDefaults.putString(KEY_VVM_TYPE_STRING, "");
		sDefaults.putBoolean(KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN, false);
		sDefaults.putBoolean(KEY_VVM_PREFETCH_BOOLEAN, true);
		sDefaults.putBoolean(KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL, false);
		sDefaults.putBoolean(KEY_VVM_PREFETCH_BOOL, true);
		sDefaults.putString(KEY_CARRIER_VVM_PACKAGE_NAME_STRING, "");
		sDefaults.putBoolean(KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL, false);
		sDefaults.putBoolean(KEY_CI_ACTION_ON_SYS_UPDATE_BOOL, false);