From e38fd07f0a4db11b84353cd8e3952815e7732f3c Mon Sep 17 00:00:00 2001
From: sandeepjs <sandeepjs@google.com>
Date: Fri, 4 Feb 2022 09:44:49 +0000
Subject: [PATCH] Updating iccCloseLogicalChannel API

Updating iccCloseLogicalChannel API to catch exceptions.

Test: atest android.carrierapi.cts.CarrierApiTest#testIccCloseLogicalChannel
Bug: 213898262
Change-Id: I6267518c94a111df1924c8a74dcd5c3561674e70
---
 telephony/java/android/telephony/TelephonyManager.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index baccb2646516f..6b2ac431f1249 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -7118,7 +7118,14 @@ public class TelephonyManager {
      */
     @RequiresFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)
     public boolean iccCloseLogicalChannel(int channel) {
-        return iccCloseLogicalChannel(getSubId(), channel);
+        try {
+            return iccCloseLogicalChannel(getSubId(), channel);
+        } catch (IllegalStateException ex) {
+            Rlog.e(TAG, "iccCloseLogicalChannel IllegalStateException", ex);
+        } catch (IllegalArgumentException ex) {
+            Rlog.e(TAG, "iccCloseLogicalChannel IllegalArgumentException", ex);
+        }
+        return false;
     }
 
     /**