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

Merge "Add new carrier config to record the default preference setting" into tm-qpr-dev am: 7e909b6014

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

Change-Id: Id572bfa30a94713f70490a254326c1328cbc2a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-11-17 16:29:05 +00:00
committed by Automerger Merge Worker
parent 574a947dc7 7e909b6014
commit 1d010fba21
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -8560,6 +8560,16 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_VONR_ENABLED_BOOL = "vonr_enabled_bool"; public static final String KEY_VONR_ENABLED_BOOL = "vonr_enabled_bool";
/**
* Boolean indicating the default VoNR user preference setting.
* If true, the VoNR setting will be enabled. If false, it will be disabled initially.
*
* Enabled by default.
*
* @hide
*/
public static final String KEY_VONR_ON_BY_DEFAULT_BOOL = "vonr_on_by_default_bool";
/** /**
* Determine whether unthrottle data retry when tracking area code (TAC/LAC) from cell changes * Determine whether unthrottle data retry when tracking area code (TAC/LAC) from cell changes
* *
@@ -9253,6 +9263,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_UNTHROTTLE_DATA_RETRY_WHEN_TAC_CHANGES_BOOL, false); sDefaults.putBoolean(KEY_UNTHROTTLE_DATA_RETRY_WHEN_TAC_CHANGES_BOOL, false);
sDefaults.putBoolean(KEY_VONR_SETTING_VISIBILITY_BOOL, true); sDefaults.putBoolean(KEY_VONR_SETTING_VISIBILITY_BOOL, true);
sDefaults.putBoolean(KEY_VONR_ENABLED_BOOL, false); sDefaults.putBoolean(KEY_VONR_ENABLED_BOOL, false);
sDefaults.putBoolean(KEY_VONR_ON_BY_DEFAULT_BOOL, true);
sDefaults.putStringArray(KEY_IWLAN_HANDOVER_POLICY_STRING_ARRAY, new String[]{ sDefaults.putStringArray(KEY_IWLAN_HANDOVER_POLICY_STRING_ARRAY, new String[]{
"source=GERAN|UTRAN|EUTRAN|NGRAN|IWLAN, " "source=GERAN|UTRAN|EUTRAN|NGRAN|IWLAN, "
+ "target=GERAN|UTRAN|EUTRAN|NGRAN|IWLAN, type=allowed"}); + "target=GERAN|UTRAN|EUTRAN|NGRAN|IWLAN, type=allowed"});