From 6a837e535294394573f33ec0b7f3a7aaa35b6e85 Mon Sep 17 00:00:00 2001 From: Gary Jian Date: Tue, 12 Oct 2021 18:06:32 +0800 Subject: Added nr advanced calling settings support - Added a telephony provider entry for storing the user's settings. - Added new vonr_enabled_bool config to determine whether VoNR should be enabled for carrier Bug: 202150953 Test: manual Change-Id: Ie56a7de3fdb978353af77bafb55b0e37c22b58a4 Merged-In: Ie56a7de3fdb978353af77bafb55b0e37c22b58a4 --- telephony/java/android/telephony/CarrierConfigManager.java | 11 +++++++++++ telephony/java/android/telephony/SubscriptionManager.java | 9 +++++++++ 2 files changed, 20 insertions(+) (limited to 'telephony/java/android') diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 68ef7543c33f..8720a4388c5a 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -5170,6 +5170,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 * @@ -5785,6 +5795,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); } /** diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 114c90bbd87a..1be1f2f8de30 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -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 -- cgit v1.2.3