diff options
| author | 2022-10-20 04:42:18 +0000 | |
|---|---|---|
| committer | 2022-10-20 04:42:18 +0000 | |
| commit | c633bfc940d0cbedd84355b6a1330e4546ae947f (patch) | |
| tree | 655295ea0c16260bd1be36443d4f991062ce04fb | |
| parent | aab9d2dba5cd3d18fe369e6066b525618daf35b1 (diff) | |
| parent | ce1c086217a341faf5b31bf9314fdb18601358c5 (diff) | |
Merge "Expose VoNR keys as public API to let carrier service able to config" am: ce1c086217
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2086223
Change-Id: I7a1d941877b9af23b9a4e8c0ff17a8be9ebd572b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 9c7796ef9d4b..93cb7e45a047 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -41452,6 +41452,8 @@ package android.telephony { field public static final String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool"; 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_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"; field public static final String KEY_VVM_CLIENT_PREFIX_STRING = "vvm_client_prefix_string"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index cf6d681d596a..8e6d6a81e579 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -8531,11 +8531,12 @@ public class CarrierConfigManager { /** * Boolean indicating if the VoNR setting is visible in the Call Settings menu. - * If true, the VoNR setting menu will be visible. If false, the menu will be gone. + * If this flag is set and VoNR is enabled for this carrier (see {@link #KEY_VONR_ENABLED_BOOL}) + * the VoNR setting menu will be visible. If {@link #KEY_VONR_ENABLED_BOOL} or + * this setting is false, the menu will be gone. * - * Disabled by default. + * Enabled by default. * - * @hide */ public static final String KEY_VONR_SETTING_VISIBILITY_BOOL = "vonr_setting_visibility_bool"; @@ -8545,7 +8546,6 @@ public class CarrierConfigManager { * * Disabled by default. * - * @hide */ public static final String KEY_VONR_ENABLED_BOOL = "vonr_enabled_bool"; |