Merge "Added nr advanced calling settings support" (ec844533) · Commits · e / os / android_frameworks_base

core/java/android/provider/Telephony.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -5365,5 +5365,14 @@ public final class Telephony {
		*/
		public static final String COLUMN_D2D_STATUS_SHARING_SELECTED_CONTACTS =
		"d2d_sharing_contacts";

		/**
		* TelephonyProvider column name for NR Advanced calling
		* Determines if the user has enabled VoNR settings for this subscription.
		*
		* @hide
		*/
		public static final String COLUMN_NR_ADVANCED_CALLING_ENABLED =
		"nr_advanced_calling_enabled";
		}
		}

+11 −0

Original line number	Diff line number	Diff line
		@@ -5268,6 +5268,16 @@ public class CarrierConfigManager {
		*/
		public static final String KEY_VONR_SETTING_VISIBILITY_BOOL = "vonr_setting_visibility_bool";

		/**
		* Flag specifying whether VoNR should be enabled for carrier.
		* If true, VoNr will be enabled. If false, hard disabled.
		*
		* Disabled by default.
		*
		* @hide
		*/
		public static final String KEY_VONR_ENABLED_BOOL = "vonr_enabled_bool";

		/**
		* Determine whether unthrottle data retry when tracking area code (TAC/LAC) from cell changes
		*
		@@ -5893,6 +5903,7 @@ public class CarrierConfigManager {
		sDefaults.putBoolean(KEY_DISPLAY_NO_DATA_NOTIFICATION_ON_PERMANENT_FAILURE_BOOL, false);
		sDefaults.putBoolean(KEY_UNTHROTTLE_DATA_RETRY_WHEN_TAC_CHANGES_BOOL, false);
		sDefaults.putBoolean(KEY_VONR_SETTING_VISIBILITY_BOOL, false);
		sDefaults.putBoolean(KEY_VONR_ENABLED_BOOL, false);
		}

		/**

+9 −0

Original line number	Diff line number	Diff line
		@@ -948,6 +948,15 @@ public class SubscriptionManager {
		*/
		public static final String VOIMS_OPT_IN_STATUS = SimInfo.COLUMN_VOIMS_OPT_IN_STATUS;

		/**
		* TelephonyProvider column name for NR Advanced calling
		* Determines if the user has enabled VoNR settings for this subscription.
		*
		* @hide
		*/
		public static final String NR_ADVANCED_CALLING_ENABLED =
		SimInfo.COLUMN_NR_ADVANCED_CALLING_ENABLED;

		/**
		* Profile class of the subscription
		* @hide