]> git.eshelyaron.com Git - emacs.git/commitdiff
Prevent crash when requesting storage permissions on Android
authorPo Lu <luangruo@yahoo.com>
Fri, 7 Feb 2025 03:11:51 +0000 (11:11 +0800)
committerEshel Yaron <me@eshelyaron.com>
Sun, 9 Feb 2025 08:43:05 +0000 (09:43 +0100)
* java/org/gnu/emacs/EmacsService.java (requestStorageAccess30):
Handle ActivityNotFoundException.

(cherry picked from commit 1751739152149608d28853782ce53b0b9a749bb2)

java/org/gnu/emacs/EmacsService.java

index 04563590dc4a27cc4b6103b0b3e1fadbda3f332e..5225337a8267053722106ad7e10589bef4160c82 100644 (file)
@@ -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 ();
+           }
        }
       };