Snap for 8680285 from d342f0b2901e81723e4d4d0c1f613c65dc791d6f to mainline-go-conscrypt-release

Change-Id: I679fc6389cc4f45a47d8b03801acf4b023ab0e6f

1 files changed, 8 insertions, 6 deletions

diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 257aef91..cf95a20b 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -1634,7 +1634,7 @@ public class ImsManager implements FeatureUpdates {
 
         try {
             return iTelephony.getImsProvisioningStatusForCapability(subId, capability, tech);
-        } catch (RemoteException e) {
+        } catch (RemoteException | IllegalArgumentException e) {
             logw("getImsProvisionedBoolNoException: operation failed for capability=" + capability
                     + ". Exception:" + e.getMessage() + ". Returning false.");
             return false;
@@ -1660,7 +1660,7 @@ public class ImsManager implements FeatureUpdates {
 
         try {
             return iTelephony.getRcsProvisioningStatusForCapability(subId, capability, tech);
-        } catch (RemoteException e) {
+        } catch (RemoteException | IllegalArgumentException e) {
             logw("getRcsProvisionedBoolNoException: operation failed for capability=" + capability
                     + ". Exception:" + e.getMessage() + ". Returning false.");
             return false;
@@ -3157,8 +3157,9 @@ public class ImsManager implements FeatureUpdates {
         try {
             required = iTelephony.isProvisioningRequiredForCapability(subId, capability,
                     tech);
-        } catch (RemoteException e) {
-            logw("isMmTelProvisioningRequired couldn't reach telephony!");
+        } catch (RemoteException | IllegalArgumentException e) {
+            logw("isMmTelProvisioningRequired : operation failed" + " capability=" + capability
+                    + " tech=" + tech + ". Exception:" + e.getMessage());
         }
 
         log("MmTel Provisioning required " + required + " for capability " + capability);
@@ -3182,8 +3183,9 @@ public class ImsManager implements FeatureUpdates {
         try {
             required = iTelephony.isRcsProvisioningRequiredForCapability(subId, capability,
                     tech);
-        } catch (RemoteException e) {
-            logw("isRcsProvisioningRequired couldn't reach telephony!");
+        } catch (RemoteException | IllegalArgumentException e) {
+            logw("isRcsProvisioningRequired : operation failed" + " capability=" + capability
+                    + " tech=" + tech + ". Exception:" + e.getMessage());
         }
 
         log("Rcs Provisioning required " + required + " for capability " + capability);