Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added cross sim calling settings support" am: 7f6a8a9648 am: aa7996126a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e2954338461b79f069c5efc6f15acb38c0538fc
This commit is contained in:
Hui Wang
2020-12-17 16:52:04 +00:00
committed by Automerger Merge Worker
parent c86ad33f7e aa7996126a
commit a82cdddff4
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/provider/Telephony.java
View File

@@ -5166,6 +5166,14 @@ public final class Telephony {
*/ */
public static final String COLUMN_IMS_RCS_UCE_ENABLED = "ims_rcs_uce_enabled"; 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, * TelephonyProvider column name for whether a subscription is opportunistic, that is,
* whether the network it connects to is limited in functionality or coverage. * whether the network it connects to is limited in functionality or coverage.

7
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -790,6 +790,13 @@ public class SubscriptionManager {
*/ */
public static final String IMS_RCS_UCE_ENABLED = SimInfo.COLUMN_IMS_RCS_UCE_ENABLED; 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, * TelephonyProvider column name for whether a subscription is opportunistic, that is,
* whether the network it connects to is limited in functionality or coverage. * whether the network it connects to is limited in functionality or coverage.