Merge "[RCS] Add set/getRcsProvisioningStatusForCapability()" am: b1c730d069... (d01f21c4) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -45185,6 +45185,7 @@ package android.telephony {
		field public static final String KEY_CARRIER_INSTANT_LETTERING_LENGTH_LIMIT_INT = "carrier_instant_lettering_length_limit_int";
		field public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool";
		field public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";
		field public static final String KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL = "carrier_rcs_provisioning_required_bool";
		field public static final String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";
		field public static final String KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL = "carrier_supports_ss_over_ut_bool";
		field public static final String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool";

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -11483,10 +11483,12 @@ package android.telephony.ims {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public int getProvisioningIntValue(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean getProvisioningStatusForCapability(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int);
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public String getProvisioningStringValue(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean getRcsProvisioningStatusForCapability(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.Callback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningIntValue(int, int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setProvisioningStatusForCapability(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int, boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);
		field public static final int KEY_EAB_PROVISIONING_STATUS = 25; // 0x19
		field public static final int KEY_RCS_AVAILABILITY_CACHE_EXPIRATION_SEC = 19; // 0x13

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -3819,10 +3819,12 @@ package android.telephony.ims {
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") @WorkerThread public int getProvisioningIntValue(int);
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") @WorkerThread public boolean getProvisioningStatusForCapability(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int);
		method @Nullable @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") @WorkerThread public String getProvisioningStringValue(int);
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") @WorkerThread public boolean getRcsProvisioningStatusForCapability(int);
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void registerProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.Callback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningIntValue(int, int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setProvisioningStatusForCapability(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int, boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);
		field public static final int KEY_EAB_PROVISIONING_STATUS = 25; // 0x19
		field public static final int KEY_RCS_AVAILABILITY_CACHE_EXPIRATION_SEC = 19; // 0x13

telephony/java/android/telephony/CarrierConfigManager.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -671,6 +671,12 @@ public class CarrierConfigManager {
		public static final String KEY_CARRIER_PROMOTE_WFC_ON_CALL_FAIL_BOOL =
		"carrier_promote_wfc_on_call_fail_bool";

		/**
		* Flag specifying whether provisioning is required for RCS.
		*/
		public static final String KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL =
		"carrier_rcs_provisioning_required_bool";

		/**
		* Flag specifying whether provisioning is required for VoLTE, Video Telephony, and WiFi
		* Calling.
		@@ -3500,6 +3506,7 @@ public class CarrierConfigManager {
		sDefaults.putInt(KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT, 2);
		sDefaults.putInt(KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT, 2);
		sDefaults.putBoolean(KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL, false);
		sDefaults.putBoolean(KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL, true);
		sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL, false);
		sDefaults.putBoolean(KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL, false);
		sDefaults.putBoolean(KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL, false);

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

+49 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyFrameworkInitializer;
		import android.telephony.ims.aidl.IImsConfigCallback;
		import android.telephony.ims.feature.MmTelFeature;
		import android.telephony.ims.feature.RcsFeature;
		import android.telephony.ims.stub.ImsConfigImplBase;
		import android.telephony.ims.stub.ImsRegistrationImplBase;

		@@ -545,6 +546,54 @@ public class ProvisioningManager {
		}
		}

		/**
		* Get the provisioning status for the IMS RCS capability specified.
		*
		* If provisioning is not required for the queried
		* {@link RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag} this method will always return
		* {@code true}.
		*
		* @see CarrierConfigManager#KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL
		* @return true if the device is provisioned for the capability or does not require
		* provisioning, false if the capability does require provisioning and has not been
		* provisioned yet.
		*/
		@WorkerThread
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public boolean getRcsProvisioningStatusForCapability(
		@RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability) {
		try {
		return getITelephony().getRcsProvisioningStatusForCapability(mSubId, capability);
		} catch (RemoteException e) {
		throw e.rethrowAsRuntimeException();
		}
		}

		/**
		* Set the provisioning status for the IMS RCS capability using the specified subscription.
		*
		* Provisioning may or may not be required, depending on the carrier configuration. If
		* provisioning is not required for the carrier associated with this subscription or the device
		* does not support the capability/technology combination specified, this operation will be a
		* no-op.
		*
		* @see CarrierConfigManager#KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL
		* @param isProvisioned true if the device is provisioned for the RCS capability specified,
		* false otherwise.
		*/
		@WorkerThread
		@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
		public void setRcsProvisioningStatusForCapability(
		@RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability,
		boolean isProvisioned) {
		try {
		getITelephony().setRcsProvisioningStatusForCapability(mSubId, capability,
		isProvisioned);
		} catch (RemoteException e) {
		throw e.rethrowAsRuntimeException();
		}
		}

		/**
		* Notify the framework that an RCS autoconfiguration XML file has been received for
		* provisioning.