From e6a276db5be763fcc345181bdd53358f601205d0 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Fri, 7 Feb 2025 11:11:51 +0800 Subject: [PATCH] Prevent crash when requesting storage permissions on Android * java/org/gnu/emacs/EmacsService.java (requestStorageAccess30): Handle ActivityNotFoundException. (cherry picked from commit 1751739152149608d28853782ce53b0b9a749bb2) --- java/org/gnu/emacs/EmacsService.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java index 04563590dc4..5225337a826 100644 --- a/java/org/gnu/emacs/EmacsService.java +++ b/java/org/gnu/emacs/EmacsService.java @@ -54,6 +54,7 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; +import android.content.ActivityNotFoundException; import android.content.ClipboardManager; import android.content.Context; import android.content.ContentResolver; @@ -2092,7 +2093,15 @@ public final class EmacsService extends Service /* Now request these permissions. */ - activity.startActivity (intent); + try + { + activity.startActivity (intent); + } + catch (ActivityNotFoundException exception) + { + Log.w (TAG, "Failed to request storage access permissions: "); + exception.printStackTrace (); + } } }; -- 2.39.5