Merge "Add new provisioning flag for VOIMS opt-in" into sc-dev (c74f9c26) · Commits · e / os / android_frameworks_base

core/java/android/provider/Telephony.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -5302,5 +5302,13 @@ public final class Telephony {
		* @hide
		*/
		public static final String COLUMN_RCS_CONFIG = "rcs_config";

		/**
		* TelephonyProvider column name for VoIMS provisioning. Default is 0.
		* <P>Type: INTEGER </P>
		*
		* @hide
		*/
		public static final String COLUMN_VOIMS_OPT_IN_STATUS = "voims_opt_in_status";
		}
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -890,6 +890,14 @@ public class SubscriptionManager {
		*/
		public static final String PROFILE_CLASS = SimInfo.COLUMN_PROFILE_CLASS;

		/**
		* TelephonyProvider column name for VoIMS opt-in status.
		*
		* <P>Type: INTEGER (int)</P>
		* @hide
		*/
		public static final String VOIMS_OPT_IN_STATUS = SimInfo.COLUMN_VOIMS_OPT_IN_STATUS;

		/**
		* Profile class of the subscription
		* @hide

+13 −0

Original line number	Diff line number	Diff line
		@@ -865,6 +865,19 @@ public class ProvisioningManager {
		*/
		public static final int KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID = 67;

		/**
		* An integer key representing the voice over IMS opt-in provisioning status for the
		* associated subscription. Determines whether the user can see for voice services over
		* IMS.
		* <p>
		* Use {@link #PROVISIONING_VALUE_ENABLED} to enable VoIMS provisioning and
		* {@link #PROVISIONING_VALUE_DISABLED} to disable VoIMS provisioning.
		* @see #setProvisioningIntValue(int, int)
		* @see #getProvisioningIntValue(int)
		* @hide
		*/
		public static final int KEY_VOIMS_OPT_IN_STATUS = 68;

		/**
		* Callback for IMS provisioning changes.
		*/

+2 −0

Original line number	Diff line number	Diff line
		@@ -47,4 +47,6 @@ interface IImsConfig {
		void removeRcsConfigCallback(IRcsConfigCallback c);
		void triggerRcsReconfiguration();
		void setRcsClientConfiguration(in RcsClientConfiguration rcc);
		void notifyIntImsConfigChanged(int item, int value);
		void notifyStringImsConfigChanged(int item, String value);
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -258,6 +258,16 @@ public class ImsConfigImplBase {
		public void setRcsClientConfiguration(RcsClientConfiguration rcc) throws RemoteException {
		getImsConfigImpl().setRcsClientConfiguration(rcc);
		}

		@Override
		public void notifyIntImsConfigChanged(int item, int value) throws RemoteException {
		notifyImsConfigChanged(item, value);
		}

		@Override
		public void notifyStringImsConfigChanged(int item, String value) throws RemoteException {
		notifyImsConfigChanged(item, value);
		}
		}

		/**