Update Android port

* src/android.c (android_destroy_handle): Handle OOM errors in
android_destroy_handle.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/android.c b/src/android.c
index e2ae77e30d0..69c87e731bd 100644
--- a/src/android.c
+++ b/src/android.c
@@ -2914,6 +2914,13 @@ android_destroy_handle (android_handle handle)
   (*android_java_env)->CallVoidMethod (android_java_env,
                                        android_handles[handle].handle,
                                        method);
+
+  /* Just clear any exception thrown.  If destroying the handle
+     fails from an out-of-memory error, then Emacs loses some
+     resources, but that is not as big deal as signalling.  */
+  (*android_java_env)->ExceptionClear (android_java_env);
+
+  /* Delete the global reference regardless of any error.  */
   (*android_java_env)->DeleteGlobalRef (android_java_env,
                                         android_handles[handle].handle);
   android_handles[handle].handle = NULL;