summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorHui Wang <huiwang@google.com>2020-12-17 16:52:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-17 16:52:04 +0000
commita82cdddff4fe25cf60e2ac478dad16f404945b48 (patch)
tree90fdb3c6b8f4d5de38ad298e786dcb153f339c12 /core/java
parentc86ad33f7eca22f832a40fb2b9a96b81a6f17764 (diff)
parentaa7996126a25915b748188d78fc2e48d526bea57 (diff)
Merge "Added cross sim calling settings support" am: 7f6a8a9648 am: aa7996126a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532259 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7e2954338461b79f069c5efc6f15acb38c0538fc
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Telephony.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 6054de8daf42..99c82c507ae8 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -5167,6 +5167,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.
* For example, CBRS.