Merge "Add public API to ProvisioningManager for IMS/RCS provisioning by... (e120a5c1) · Commits · e / os / android_frameworks_base

core/api/current.txt

+39 −0

Original line number	Original line	Diff line number	Diff line
	@@ -44734,6 +44734,7 @@ package android.telephony.ims {
	public class ImsManager {		public class ImsManager {
	method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);		method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);
	method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);		method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);
			method @NonNull public android.telephony.ims.ProvisioningManager getProvisioningManager(int);
	field public static final String ACTION_WFC_IMS_REGISTRATION_ERROR = "android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR";		field public static final String ACTION_WFC_IMS_REGISTRATION_ERROR = "android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR";
	field public static final String EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_MESSAGE";		field public static final String EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_MESSAGE";
	field public static final String EXTRA_WFC_REGISTRATION_FAILURE_TITLE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_TITLE";		field public static final String EXTRA_WFC_REGISTRATION_FAILURE_TITLE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_TITLE";
	@@ -44984,6 +44985,23 @@ package android.telephony.ims {
	field public static final int REASON_UNKNOWN_TEMPORARY_ERROR = 1; // 0x1		field public static final int REASON_UNKNOWN_TEMPORARY_ERROR = 1; // 0x1
	}		}

			public class ProvisioningManager {
			method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) @WorkerThread public boolean getProvisioningStatusForCapability(int, int);
			method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) @WorkerThread public boolean getRcsProvisioningStatusForCapability(int, int);
			method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public boolean isProvisioningRequiredForCapability(int, int);
			method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public boolean isRcsProvisioningRequiredForCapability(int, int);
			method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void registerFeatureProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.FeatureProvisioningCallback) throws android.telephony.ims.ImsException;
			method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setProvisioningStatusForCapability(int, int, boolean);
			method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, int, boolean);
			method public void unregisterFeatureProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.FeatureProvisioningCallback);
			}

			public static class ProvisioningManager.FeatureProvisioningCallback {
			ctor public ProvisioningManager.FeatureProvisioningCallback();
			method public void onFeatureProvisioningChanged(int, int, boolean);
			method public void onRcsFeatureProvisioningChanged(int, int, boolean);
			}

	public class RcsUceAdapter {		public class RcsUceAdapter {
	method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isUceSettingEnabled() throws android.telephony.ims.ImsException;		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isUceSettingEnabled() throws android.telephony.ims.ImsException;
	}		}
	@@ -45024,6 +45042,27 @@ package android.telephony.ims.feature {
	field public static final int CAPABILITY_TYPE_VOICE = 1; // 0x1		field public static final int CAPABILITY_TYPE_VOICE = 1; // 0x1
	}		}

			public class RcsFeature {
			}

			public static class RcsFeature.RcsImsCapabilities {
			field public static final int CAPABILITY_TYPE_NONE = 0; // 0x0
			field public static final int CAPABILITY_TYPE_OPTIONS_UCE = 1; // 0x1
			field public static final int CAPABILITY_TYPE_PRESENCE_UCE = 2; // 0x2
			}

			}

			package android.telephony.ims.stub {

			public class ImsRegistrationImplBase {
			field public static final int REGISTRATION_TECH_CROSS_SIM = 2; // 0x2
			field public static final int REGISTRATION_TECH_IWLAN = 1; // 0x1
			field public static final int REGISTRATION_TECH_LTE = 0; // 0x0
			field public static final int REGISTRATION_TECH_NONE = -1; // 0xffffffff
			field public static final int REGISTRATION_TECH_NR = 3; // 0x3
			}

	}		}

	package android.telephony.mbms {		package android.telephony.mbms {

core/api/system-current.txt

+2 −12

telephony/java/android/telephony/CarrierConfigManager.java

+32 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5173,6 +5173,36 @@ public class CarrierConfigManager {
	/** E911 RTP inactivity occurred when call is connected. */		/** E911 RTP inactivity occurred when call is connected. */
	public static final int E911_RTP_INACTIVITY_ON_CONNECTED = 4;		public static final int E911_RTP_INACTIVITY_ON_CONNECTED = 4;

			/**
			* An array of strings, each entry contains a MMTEL capability and registration
			* technology tuple that requires provisioning. If a tuple is not present, the
			* framework will not require that the tuple requires provisioning before
			* enabling the capability.
			* <p>
			* Format for each tuple is two integers separated by a comma. The first
			* integer is an integer defined in
			* {@link MmTelFeature.MmTelCapabilities.MmTelCapability} and the second integer is
			* {@link android.telephony.ims.stub.ImsRegistrationImplBase.ImsRegistrationTech}
			* @hide
			*/
			public static final String KEY_MMTEL_REQUIRES_PROVISIONING_STRING_ARRAY =
			KEY_PREFIX + "mmtel_requires_provisioning_string_array";

			/**
			* An array of strings, each entry contains a RCS capability and registration
			* technology tuple that requires provisioning. If a tuple is not present, the
			* framework will not require that the tuple requires provisioning before
			* enabling the capability.
			* <p>
			* Format for each tuple is two integers separated by a comma. The first
			* integer is an integer defined in
			* {@link RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag} and the second integer is
			* {@link android.telephony.ims.stub.ImsRegistrationImplBase.ImsRegistrationTech}
			* @hide
			*/
			public static final String KEY_RCS_REQUIRES_PROVISIONING_STRING_ARRAY =
			KEY_PREFIX + "rcs_requires_provisioning_string_array";

	private Ims() {}		private Ims() {}

	private static PersistableBundle getDefaults() {		private static PersistableBundle getDefaults() {
	@@ -5208,6 +5238,8 @@ public class CarrierConfigManager {
	"+g.3gpp.iari-ref=\"urn%3Aurn-7%3A3gpp-application.ims.iari.rcs.chatbot.sa\"",		"+g.3gpp.iari-ref=\"urn%3Aurn-7%3A3gpp-application.ims.iari.rcs.chatbot.sa\"",
	"+g.gsma.rcs.botversion=\"#=1,#=2\"",		"+g.gsma.rcs.botversion=\"#=1,#=2\"",
	"+g.gsma.rcs.cpimext"});		"+g.gsma.rcs.cpimext"});
			defaults.putStringArray(KEY_MMTEL_REQUIRES_PROVISIONING_STRING_ARRAY, new String[] {});
			defaults.putStringArray(KEY_RCS_REQUIRES_PROVISIONING_STRING_ARRAY, new String[] {});

	defaults.putBoolean(KEY_GRUU_ENABLED_BOOL, true);		defaults.putBoolean(KEY_GRUU_ENABLED_BOOL, true);
	defaults.putBoolean(KEY_SIP_OVER_IPSEC_ENABLED_BOOL, true);		defaults.putBoolean(KEY_SIP_OVER_IPSEC_ENABLED_BOOL, true);

telephony/java/android/telephony/ImsManager.java

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -163,6 +163,26 @@ public class ImsManager {
	return new SipDelegateManager(mContext, subscriptionId, sRcsCache, sTelephonyCache);		return new SipDelegateManager(mContext, subscriptionId, sRcsCache, sTelephonyCache);
	}		}


			/**
			* Create an instance of {@link ProvisioningManager} for the subscription id specified.
			* <p>
			* Provides a ProvisioningManager instance to carrier apps to update carrier provisioning
			* information, as well as provides a callback so that apps can listen for changes
			* in MMTEL/RCS provisioning
			* @param subscriptionId The ID of the subscription that this ProvisioningManager will use.
			* @throws IllegalArgumentException if the subscription is invalid.
			* @return a ProvisioningManager instance with the specific subscription ID.
			*/
			@NonNull
			public ProvisioningManager getProvisioningManager(int subscriptionId) {
			if (!SubscriptionManager.isValidSubscriptionId(subscriptionId)) {
			throw new IllegalArgumentException("Invalid subscription ID: " + subscriptionId);
			}

			return new ProvisioningManager(subscriptionId);
			}

	private static IImsRcsController getIImsRcsControllerInterface() {		private static IImsRcsController getIImsRcsControllerInterface() {
	return IImsRcsController.Stub.asInterface(		return IImsRcsController.Stub.asInterface(
	TelephonyFrameworkInitializer		TelephonyFrameworkInitializer

telephony/java/android/telephony/ims/ProvisioningManager.java

+413 −39

File changed.

Preview size limit exceeded, changes collapsed.