From ef9de7907c532d3efe6c8a980369598f574cf66e Mon Sep 17 00:00:00 2001
From: Aishwarya Mallampati <amallampati@google.com>
Date: Tue, 9 May 2023 17:37:22 +0000
Subject: [PATCH] Catch exceptions thrown by TelephonyManager

Bug: 281623169
Test: atest CtsTelephonyTestCases
      Basic sanity,
      Flashed device on raven-userdebug: calls/sms/mms are working
Change-Id: I19561200b98fa1a087c1083f2f603b47aca7b0e0
---
 .../com/android/internal/telephony/TelephonyPermissions.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java
index caafce2f1a7e4..29a952a5d6d12 100644
--- a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java
+++ b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java
@@ -862,9 +862,12 @@ public final class TelephonyPermissions {
                         + " destAddr is emergency number");
                 return true;
             }
-        }   finally {
+        } catch(Exception e) {
+            Log.e(LOG_TAG, "Cannot verify if destAddr is an emergency number: " + e);
+        } finally {
             Binder.restoreCallingIdentity(token);
         }
+
         return checkSubscriptionAssociatedWithUser(context, subId, callerUserHandle);
     }