commit 6884905c4576dc81f699e55dcf98b2ab307e94eb
author Aishwarya Mallampati <amallampati@google.com> Tue May 09 17:33:28 2023 +0000
committer Aishwarya Mallampati <amallampati@google.com> Wed May 10 17:38:45 2023 +0000
tree 442604b6d68a5adcd420a558abf6a81b973779bb
parent 07e8e046d3faab65a7c7432787eba07068e8e64f

Catch exceptions thrown by TelephonyManager

Bug: 281623169
Test: atest CtsTelephonyTestCases
      Basic sanity,
      Flashed device on raven-userdebug: calls/sms/mms are working
Change-Id: I86dbaf9f410dbc77f678e390a5e65f5fda505ec5

src/com/android/providers/telephony/ProviderUtil.java

diff --git a/src/com/android/providers/telephony/ProviderUtil.java b/src/com/android/providers/telephony/ProviderUtil.java
index 80cf5ce..54ce5ee 100644
--- a/src/com/android/providers/telephony/ProviderUtil.java
+++ b/src/com/android/providers/telephony/ProviderUtil.java
@@ -196,8 +196,12 @@
         // Get emergency number list to add it to selection string.
         TelephonyManager tm = context.getSystemService(TelephonyManager.class);
         Map<Integer, List<EmergencyNumber>> emergencyNumberList = null;
-        if (tm != null) {
-            emergencyNumberList = tm.getEmergencyNumberList();
+        try {
+            if (tm != null) {
+                emergencyNumberList = tm.getEmergencyNumberList();
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Cannot get emergency number list: " + e);
         }
 
         String selectionByEmergencyNumber = null;