From 9e19af0d91a7d1e7bca596c29c7a250812700489 Mon Sep 17 00:00:00 2001 From: Gary Jian Date: Tue, 8 Nov 2022 08:00:10 +0000 Subject: [PATCH] =?UTF-8?q?Add=20new=20carrier=20config=C2=A0to=20record?= =?UTF-8?q?=20the=20default=20preference=20setting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some carriers need to disable the VoNR setting as default, so introduce new config “vonr_on_by_default_bool” to control this requirement. Bug: 237621350 Test: manual Change-Id: Idaa9cfb1739f8261e9a4697eae30b7f4e16241c7 --- core/api/current.txt | 1 + .../java/android/telephony/CarrierConfigManager.java | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/core/api/current.txt b/core/api/current.txt index da7a7e8483432..349ec9d70235e 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -41860,6 +41860,7 @@ package android.telephony { field public static final String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool"; field public static final String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int"; field public static final String KEY_VONR_ENABLED_BOOL = "vonr_enabled_bool"; + field public static final String KEY_VONR_ON_BY_DEFAULT_BOOL = "vonr_on_by_default_bool"; field public static final String KEY_VONR_SETTING_VISIBILITY_BOOL = "vonr_setting_visibility_bool"; field public static final String KEY_VT_UPGRADE_SUPPORTED_FOR_DOWNGRADED_RTT_CALL_BOOL = "vt_upgrade_supported_for_downgraded_rtt_call"; field public static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required_bool"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 453c656ed9bbf..99361a0f6c436 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -8692,6 +8692,15 @@ public class CarrierConfigManager { */ 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. + * + */ + 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 * @@ -9515,6 +9524,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_UNTHROTTLE_DATA_RETRY_WHEN_TAC_CHANGES_BOOL, false); sDefaults.putBoolean(KEY_VONR_SETTING_VISIBILITY_BOOL, true); sDefaults.putBoolean(KEY_VONR_ENABLED_BOOL, false); + sDefaults.putBoolean(KEY_VONR_ON_BY_DEFAULT_BOOL, true); sDefaults.putIntArray(KEY_SUPPORTED_PREMIUM_CAPABILITIES_INT_ARRAY, new int[] {}); sDefaults.putLong(KEY_PREMIUM_CAPABILITY_NOTIFICATION_DISPLAY_TIMEOUT_MILLIS_LONG, TimeUnit.MINUTES.toMillis(30));