From ce026fd5b9625dae0c65b11790a6ece647c2c2f1 Mon Sep 17 00:00:00 2001
From: Hui Wang <huiwang@google.com>
Date: Thu, 17 Dec 2020 00:57:18 +0000
Subject: [PATCH] Added cross sim calling settings support

Added a telephony provider entry for storing the
user's settings.

Fix: 173250681
Test: Manual
Merged-In: I081c7e5fcc98f51a97c41a0a9a2b9b628c8d0415
Change-Id: I081c7e5fcc98f51a97c41a0a9a2b9b628c8d0415
---
 core/java/android/provider/Telephony.java                 | 8 ++++++++
 telephony/java/android/telephony/SubscriptionManager.java | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 6054de8daf42b..99c82c507ae83 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -5166,6 +5166,14 @@ public final class Telephony {
          */
         public static final String COLUMN_IMS_RCS_UCE_ENABLED = "ims_rcs_uce_enabled";
 
+        /**
+         * TelephonyProvider column name for determining if the user has enabled cross SIM calling
+         * for this subscription.
+         *
+         * @hide
+         */
+        public static final String COLUMN_CROSS_SIM_CALLING_ENABLED = "cross_sim_calling_enabled";
+
         /**
          * TelephonyProvider column name for whether a subscription is opportunistic, that is,
          * whether the network it connects to is limited in functionality or coverage.
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 83e63ef29e2c1..904232b54b8f5 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -790,6 +790,13 @@ public class SubscriptionManager {
      */
     public static final String IMS_RCS_UCE_ENABLED = SimInfo.COLUMN_IMS_RCS_UCE_ENABLED;
 
+    /**
+     * Determines if the user has enabled cross SIM calling for this subscription.
+     *
+     * @hide
+     */
+    public static final String CROSS_SIM_CALLING_ENABLED = SimInfo.COLUMN_CROSS_SIM_CALLING_ENABLED;
+
     /**
      * TelephonyProvider column name for whether a subscription is opportunistic, that is,
      * whether the network it connects to is limited in functionality or coverage.