From 00e70212c539aed4386a44844cbf1df53d792fb6 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 14 Oct 2022 13:51:35 -0400 Subject: [PATCH] Catch possible phone permission exception on specific devices. --- .../thoughtcrime/securesms/util/TelephonyUtil.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java index e886ed09da..95a37dcdb2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java @@ -47,9 +47,14 @@ public class TelephonyUtil { } public static boolean isAnyPstnLineBusy(@NonNull Context context) { - if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) { - return getManager(context).getCallState() != TelephonyManager.CALL_STATE_IDLE; - } else { + try { + if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) { + return getManager(context).getCallState() != TelephonyManager.CALL_STATE_IDLE; + } else { + return false; + } + } catch (SecurityException e) { + Log.w(TAG, "Failed to determine if busy!", e); return false; } }