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

Commit 0e65b727 authored Sep 16, 2022 by Hunsuk Choi

Replace ImsFailureReason with SuggestedAction

Bug: 219242990
Bug: 246678554
Test: atest FrameworksTelephonyTests:ImsPhoneCallTrackerTest#testUpdateImsRegistrationInfo
Change-Id: Ib21fae72eeb3fc0bd99ce7fc80c6ba486a79fb7e
Merged-In: Ib21fae72eeb3fc0bd99ce7fc80c6ba486a79fb7e

parent fb02560b

src/java/com/android/internal/telephony/CommandsInterface.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2848,12 +2848,12 @@ public interface CommandsInterface {
	*		*
	* @param state The current IMS registration state.		* @param state The current IMS registration state.
	* @param accessNetworkType The type of underlying radio access network used.		* @param accessNetworkType The type of underlying radio access network used.
	* @param reason A failure reason for IMS registration.		* @param suggestedAction The expected action that modem should perform.
	* @param capabilities IMS capabilities such as VOICE, VIDEO and SMS.		* @param capabilities IMS capabilities such as VOICE, VIDEO and SMS.
	*/		*/
	default void updateImsRegistrationInfo(int state,		default void updateImsRegistrationInfo(int state,
	@AccessNetworkConstants.RadioAccessNetworkType int accessNetworkType,		@AccessNetworkConstants.RadioAccessNetworkType int accessNetworkType,
	int reason, int capabilities, Message result) {}		int suggestedAction, int capabilities, Message result) {}

	/**		/**
	* Notifies the NAS and RRC layers of the radio the type of upcoming IMS traffic.		* Notifies the NAS and RRC layers of the radio the type of upcoming IMS traffic.

src/java/com/android/internal/telephony/RIL.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5151,7 +5151,7 @@ public class RIL extends BaseCommands implements CommandsInterface {

	@Override		@Override
	public void updateImsRegistrationInfo(int state,		public void updateImsRegistrationInfo(int state,
	int accessNetworkType, int reason, int capabilities, Message result) {		int accessNetworkType, int suggestedAction, int capabilities, Message result) {
	RadioImsProxy imsProxy = getRadioServiceProxy(RadioImsProxy.class, result);		RadioImsProxy imsProxy = getRadioServiceProxy(RadioImsProxy.class, result);
	if (imsProxy.isEmpty()) return;		if (imsProxy.isEmpty()) return;
	if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_2_1)) {		if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_2_1)) {
	@@ -5167,7 +5167,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	new android.hardware.radio.ims.ImsRegistration();		new android.hardware.radio.ims.ImsRegistration();
	registrationInfo.regState = RILUtils.convertImsRegistrationState(state);		registrationInfo.regState = RILUtils.convertImsRegistrationState(state);
	registrationInfo.accessNetworkType = accessNetworkType;		registrationInfo.accessNetworkType = accessNetworkType;
	registrationInfo.reason = reason;		registrationInfo.suggestedAction = suggestedAction;
	registrationInfo.capabilities = RILUtils.convertImsCapability(capabilities);		registrationInfo.capabilities = RILUtils.convertImsCapability(capabilities);

	try {		try {