Merge "Mainline Network Policy constants public" am: 56fcc024bc am: 242454626f am: 9d3d79199b (b9a1b31d) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -44604,6 +44604,7 @@ package android.telephony {
		method public void notifyConfigChangedForSubId(int);
		field public static final String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
		field public static final int DATA_CYCLE_THRESHOLD_DISABLED = -2; // 0xfffffffe
		field public static final int DATA_CYCLE_USE_PLATFORM_DEFAULT = -1; // 0xffffffff
		field public static final String EXTRA_SLOT_INDEX = "android.telephony.extra.SLOT_INDEX";
		field public static final String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX";
		field public static final String KEY_5G_NR_SSRSRP_THRESHOLDS_INT_ARRAY = "5g_nr_ssrsrp_thresholds_int_array";
		@@ -44667,7 +44668,10 @@ package android.telephony {
		field public static final String KEY_CONFIG_PLANS_PACKAGE_OVERRIDE_STRING = "config_plans_package_override_string";
		field public static final String KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL = "config_telephony_use_own_number_for_voicemail_bool";
		field public static final String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";
		field public static final String KEY_DATA_LIMIT_NOTIFICATION_BOOL = "data_limit_notification_bool";
		field public static final String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long";
		field public static final String KEY_DATA_RAPID_NOTIFICATION_BOOL = "data_rapid_notification_bool";
		field public static final String KEY_DATA_WARNING_NOTIFICATION_BOOL = "data_warning_notification_bool";
		field public static final String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long";
		field public static final String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";
		field public static final String KEY_DEFAULT_VM_NUMBER_ROAMING_AND_IMS_UNREGISTERED_STRING = "default_vm_number_roaming_and_ims_unregistered_string";

telephony/java/android/telephony/CarrierConfigManager.java

+8 −14

Original line number	Diff line number	Diff line
		@@ -2176,7 +2176,7 @@ public class CarrierConfigManager {
		* the start of the next month.
		* <p>
		* This setting may be still overridden by explicit user choice. By default,
		* the platform value will be used.
		* {@link #DATA_CYCLE_USE_PLATFORM_DEFAULT} will be used.
		*/
		public static final String KEY_MONTHLY_DATA_CYCLE_DAY_INT =
		"monthly_data_cycle_day_int";
		@@ -2185,10 +2185,7 @@ public class CarrierConfigManager {
		* When {@link #KEY_MONTHLY_DATA_CYCLE_DAY_INT}, {@link #KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG},
		* or {@link #KEY_DATA_WARNING_THRESHOLD_BYTES_LONG} are set to this value, the platform default
		* value will be used for that key.
		*
		* @hide
		*/
		@Deprecated
		public static final int DATA_CYCLE_USE_PLATFORM_DEFAULT = -1;

		/**
		@@ -2212,8 +2209,8 @@ public class CarrierConfigManager {
		* If the value is set to {@link #DATA_CYCLE_THRESHOLD_DISABLED}, the data usage warning will
		* be disabled.
		* <p>
		* This setting may be overridden by explicit user choice. By default, the platform value
		* will be used.
		* This setting may be overridden by explicit user choice. By default,
		* {@link #DATA_CYCLE_USE_PLATFORM_DEFAULT} will be used.
		*/
		public static final String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG =
		"data_warning_threshold_bytes_long";
		@@ -2221,8 +2218,7 @@ public class CarrierConfigManager {
		/**
		* Controls if the device should automatically notify the user as they reach
		* their cellular data warning. When set to {@code false} the carrier is
		* expected to have implemented their own notification mechanism.
		* @hide
		* expected to have implemented their own notification mechanism. {@code true} by default.
		*/
		public static final String KEY_DATA_WARNING_NOTIFICATION_BOOL =
		"data_warning_notification_bool";
		@@ -2244,8 +2240,8 @@ public class CarrierConfigManager {
		* phone. If the value is set to {@link #DATA_CYCLE_THRESHOLD_DISABLED}, the data limit will be
		* disabled.
		* <p>
		* This setting may be overridden by explicit user choice. By default, the platform value
		* will be used.
		* This setting may be overridden by explicit user choice. By default,
		* {@link #DATA_CYCLE_USE_PLATFORM_DEFAULT} will be used.
		*/
		public static final String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG =
		"data_limit_threshold_bytes_long";
		@@ -2253,8 +2249,7 @@ public class CarrierConfigManager {
		/**
		* Controls if the device should automatically notify the user as they reach
		* their cellular data limit. When set to {@code false} the carrier is
		* expected to have implemented their own notification mechanism.
		* @hide
		* expected to have implemented their own notification mechanism. {@code true} by default.
		*/
		public static final String KEY_DATA_LIMIT_NOTIFICATION_BOOL =
		"data_limit_notification_bool";
		@@ -2262,8 +2257,7 @@ public class CarrierConfigManager {
		/**
		* Controls if the device should automatically notify the user when rapid
		* cellular data usage is observed. When set to {@code false} the carrier is
		* expected to have implemented their own notification mechanism.
		* @hide
		* expected to have implemented their own notification mechanism. {@code true} by default.
		*/
		public static final String KEY_DATA_RAPID_NOTIFICATION_BOOL =
		"data_rapid_notification_bool";