Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a82cdddf authored Dec 17, 2020 by Hui Wang Committed by Automerger Merge Worker Dec 17, 2020

Merge "Added cross sim calling settings support" am: 7f6a8a96 am: aa799612

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e2954338461b79f069c5efc6f15acb38c0538fc

parents c86ad33f aa799612

core/java/android/provider/Telephony.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -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.

telephony/java/android/telephony/SubscriptionManager.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -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.