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

Commit d82af6f7 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Throw an explicit ImsException if the ImsService isnt available 

In the case that the ImsService is not active for the subId requested,
do not return false because this can cause services to think that
a capability is not capable/available for a specific subId when in
reality, we haven't loaded the configs for it yet.

Bug: 218893458
Test: ImsCommonTests
Change-Id: I97d6304216ec19fcd45f9552eb4e19061f1a323a
parent 4eb921fc

telephony/java/android/telephony/ims/ImsRcsManager.java

+4 −0
Original line number Diff line number Diff line
@@ -497,6 +497,8 @@ public class ImsRcsManager { 


        try {

            return imsRcsController.isCapable(mSubId, capability, radioTech);

        } catch (ServiceSpecificException e) {

            throw new ImsException(e.getMessage(), e.errorCode);

        } catch (RemoteException e) {

            Log.w(TAG, "Error calling IImsRcsController#isCapable", e);

            throw new ImsException("Remote IMS Service is not available",
@@ -534,6 +536,8 @@ public class ImsRcsManager { 


        try {

            return imsRcsController.isAvailable(mSubId, capability, radioTech);

        } catch (ServiceSpecificException e) {

            throw new ImsException(e.getMessage(), e.errorCode);

        } catch (RemoteException e) {

            Log.w(TAG, "Error calling IImsRcsController#isAvailable", e);

            throw new ImsException("Remote IMS Service is not available",