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

Merge "Added nr advanced calling settings support" am: ec84453381 am: c366188272

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885736

Change-Id: I981d300ed36a522f6ba39bad485cabe7f71926a8
This commit is contained in:
Gary Jian
2021-11-12 02:39:05 +00:00
committed by Automerger Merge Worker
parent 5cd05e3d40 c366188272
commit 6b576ad443
3 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/Telephony.java
View File

@@ -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
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -5283,6 +5283,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
*
@@ -5909,6 +5919,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
telephony/java/android/telephony/SubscriptionManager.java
View File

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