diff options
| author | Po Lu | 2023-07-29 12:50:06 +0800 |
|---|---|---|
| committer | Po Lu | 2023-07-29 12:50:06 +0800 |
| commit | 431fdda2ebbb6e93ea4eb705ec16a44b49c30c8d (patch) | |
| tree | aedc6ef8b65aee53de203aa00443dc8989d0e02f | |
| parent | 27fe17f0fc56ac11969dbbe54485cff8a4fdab32 (diff) | |
| download | emacs-431fdda2ebbb6e93ea4eb705ec16a44b49c30c8d.tar.gz emacs-431fdda2ebbb6e93ea4eb705ec16a44b49c30c8d.zip | |
; Update Android port
* src/androidvfs.c (android_saf_exception_check): Describe
exceptions earlier.
| -rw-r--r-- | src/androidvfs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/androidvfs.c b/src/androidvfs.c index babc7101d88..b175f7746f3 100644 --- a/src/androidvfs.c +++ b/src/androidvfs.c | |||
| @@ -3739,15 +3739,17 @@ android_saf_exception_check (int n, ...) | |||
| 3739 | /* No exception has taken place. Return 0. */ | 3739 | /* No exception has taken place. Return 0. */ |
| 3740 | return 0; | 3740 | return 0; |
| 3741 | 3741 | ||
| 3742 | /* Print the exception. */ | ||
| 3743 | (*env)->ExceptionDescribe (env); | ||
| 3744 | |||
| 3742 | exception = (*env)->ExceptionOccurred (env); | 3745 | exception = (*env)->ExceptionOccurred (env); |
| 3743 | 3746 | ||
| 3744 | if (!exception) | 3747 | if (!exception) |
| 3745 | /* JNI couldn't return a local reference to the exception. */ | 3748 | /* JNI couldn't return a local reference to the exception. */ |
| 3746 | memory_full (0); | 3749 | memory_full (0); |
| 3747 | 3750 | ||
| 3748 | /* Print and clear the exception, making it safe to subsequently | 3751 | /* Clear the exception, making it safe to subsequently call other |
| 3749 | call other JNI functions. */ | 3752 | JNI functions. */ |
| 3750 | (*env)->ExceptionDescribe (env); | ||
| 3751 | (*env)->ExceptionClear (env); | 3753 | (*env)->ExceptionClear (env); |
| 3752 | 3754 | ||
| 3753 | /* Delete each of the N arguments. */ | 3755 | /* Delete each of the N arguments. */ |