Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove IllegalArgumentException for registration of capabilities"

Browse Source
This commit is contained in:
Brad Ebinger
2020-06-19 18:44:09 +00:00
committed by Gerrit Code Review
parent 5c91f871d7 e170706352
commit e51d2698ac
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telephony/java/android/telephony/ims/ImsMmTelManager.java
View File

@@ -519,9 +519,6 @@ public class ImsMmTelManager implements RegistrationManager {
* @param executor The executor the callback events should be run on. * @param executor The executor the callback events should be run on.
* @param c The MmTel {@link CapabilityCallback} to be registered. * @param c The MmTel {@link CapabilityCallback} to be registered.
* @see #unregisterMmTelCapabilityCallback(CapabilityCallback) * @see #unregisterMmTelCapabilityCallback(CapabilityCallback)
* @throws IllegalArgumentException if the subscription associated with this callback is not
* active (SIM is not inserted, ESIM inactive) or invalid, or a null {@link Executor} or
* {@link CapabilityCallback} callback.
* @throws ImsException if the subscription associated with this callback is valid, but * @throws ImsException if the subscription associated with this callback is valid, but
* the {@link ImsService} associated with the subscription is not available. This can happen if * the {@link ImsService} associated with the subscription is not available. This can happen if
* the service crashed, for example. See {@link ImsException#getCode()} for a more detailed * the service crashed, for example. See {@link ImsException#getCode()} for a more detailed
@@ -544,18 +541,13 @@ public class ImsMmTelManager implements RegistrationManager {
ITelephony iTelephony = getITelephony(); ITelephony iTelephony = getITelephony();
if (iTelephony == null) { if (iTelephony == null) {
throw new ImsException("Could not find Telephony Service.", throw new ImsException("Could not find Telephony Service.",
ImsException.CODE_ERROR_INVALID_SUBSCRIPTION); ImsException.CODE_ERROR_SERVICE_UNAVAILABLE);
} }
try { try {
iTelephony.registerMmTelCapabilityCallback(mSubId, c.getBinder()); iTelephony.registerMmTelCapabilityCallback(mSubId, c.getBinder());
} catch (ServiceSpecificException e) { } catch (ServiceSpecificException e) {
if (e.errorCode == ImsException.CODE_ERROR_INVALID_SUBSCRIPTION) { throw new ImsException(e.getMessage(), e.errorCode);
// Rethrow as runtime error to keep API compatible.
throw new IllegalArgumentException(e.getMessage());
} else {
throw new ImsException(e.getMessage(), e.errorCode);
}
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowAsRuntimeException(); throw e.rethrowAsRuntimeException();
} catch (IllegalStateException e) { } catch (IllegalStateException e) {