From 59401e18ed7d39e1fb280f4139ed51fc78ed2f23 Mon Sep 17 00:00:00 2001 From: Nicholas Tinsley Date: Mon, 27 Nov 2023 14:24:56 -0500 Subject: [PATCH] Prevent crash on audio focus permission denied. Addresses #13283. --- .../securesms/webrtc/audio/AudioManagerCompat.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCompat.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCompat.java index 80002b029a..ae9f85455a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCompat.java +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCompat.java @@ -243,13 +243,17 @@ public abstract class AudioManagerCompat { Log.w(TAG, "Trying again to request audio focus"); } - int result = audioManager.requestAudioFocus(audioFocusRequest); + try { + int result = audioManager.requestAudioFocus(audioFocusRequest); - if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) { - Log.w(TAG, "Audio focus not granted. Result code: " + result); + if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) { + Log.w(TAG, "Audio focus not granted. Result code: " + result); + return false; + } + } catch (SecurityException ex) { + Log.w(TAG, "Encountered security exception when requesting audio focus."); return false; } - return true; }