diff options
Diffstat (limited to 'src/java/com/android/ims/MmTelFeatureConnection.java')
| -rw-r--r-- | src/java/com/android/ims/MmTelFeatureConnection.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/java/com/android/ims/MmTelFeatureConnection.java b/src/java/com/android/ims/MmTelFeatureConnection.java index cd8c3f15..3170d413 100644 --- a/src/java/com/android/ims/MmTelFeatureConnection.java +++ b/src/java/com/android/ims/MmTelFeatureConnection.java @@ -87,9 +87,10 @@ public class MmTelFeatureConnection extends FeatureConnection { if (imsRegistration != null) { try { imsRegistration.removeRegistrationCallback(localCallback); - } catch (RemoteException e) { + } catch (RemoteException | IllegalStateException e) { Log.w(TAG + " [" + mSlotId + "]", "ImsRegistrationCallbackAdapter -" - + " unregisterCallback: couldn't remove registration callback"); + + " unregisterCallback: couldn't remove registration callback" + + " Exception: " + e.getMessage()); } } else { Log.e(TAG + " [" + mSlotId + "]", "ImsRegistrationCallbackAdapter: ImsRegistration" @@ -145,9 +146,9 @@ public class MmTelFeatureConnection extends FeatureConnection { if (binder != null) { try { binder.removeCapabilityCallback(localCallback); - } catch (RemoteException e) { + } catch (RemoteException | IllegalStateException e) { Log.w(TAG + " [" + mSlotId + "]", "CapabilityCallbackManager, unregister:" - + " Binder is dead."); + + " Binder is dead. Exception: " + e.getMessage()); } } else { Log.w(TAG + " [" + mSlotId + "]", "CapabilityCallbackManager, unregister:" @@ -187,9 +188,9 @@ public class MmTelFeatureConnection extends FeatureConnection { } try { binder.removeImsConfigCallback(localCallback); - } catch (RemoteException e) { + } catch (RemoteException | IllegalStateException e) { Log.w(TAG + " [" + mSlotId + "]", "ProvisioningCallbackManager - couldn't" - + " unregister, binder is dead."); + + " unregister, binder is dead. Exception: " + e.getMessage()); } } } @@ -322,8 +323,9 @@ public class MmTelFeatureConnection extends FeatureConnection { mMultiEndpoint.getInterface().setExternalCallStateListener(null); mMultiEndpoint = new BinderAccessState<>(BinderAccessState.STATE_NOT_SET); } - } catch (RemoteException e) { - Log.w(TAG + " [" + mSlotId + "]", "closeConnection: couldn't remove listeners!"); + } catch (RemoteException | IllegalStateException e) { + Log.w(TAG + " [" + mSlotId + "]", "closeConnection: couldn't remove listeners!" + + " Exception: " + e.getMessage()); } } } |