From 204ec2ae6fa9c0fee70fc3a523859e8296e02eb6 Mon Sep 17 00:00:00 2001
From: Gary Jian <garyjian@google.com>
Date: Wed, 13 Oct 2021 13:09:54 +0800
Subject: [PATCH] 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 enalbed for carrier

Bug: 202150953
Test: manual
Change-Id: Ie56a7de3fdb978353af77bafb55b0e37c22b58a4
---
 core/java/android/provider/Telephony.java             |  8 ++++++++
 .../java/android/telephony/CarrierConfigManager.java  | 11 +++++++++++
 .../java/android/telephony/SubscriptionManager.java   |  9 +++++++++
 3 files changed, 28 insertions(+)

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 387fc39a65e48..aa1bbc58669a1 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -5366,5 +5366,13 @@ 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";
     }
 }
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index edfb7bf516e50..7c6fe8e4d7c9b 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -5226,6 +5226,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
      *
@@ -5856,6 +5866,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 3b44a34048b8f..d5315acf60d5d 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