Merge from savannah/emacs-30

4c35382e983 ; * src/emacs.c (syms_of_emacs) <Vsystem_type>: Fix doc s...
34882d52432 Port better to Android 3.0
765cfaed775 ; * doc/emacs/anti.texi (Antinews): Fix typos (bug#72167).
7093504da2d ; Fix typos (bug#72167)
8c7c4f4baaa New Tramp tests
85d2d7982d4 Update Tramp manual
504bdd560af ; Fix last change
3ccebbe17b7 Fix 'toggle-window-dedicated' documentation
719d5753ca6 ; * doc/lispref/help.texi (Keys in Documentation): Add cr...
e3bba63ecb9 Checkdoc fixes in transient.el

1 files changed, 4 insertions, 4 deletions

diff --git a/java/org/gnu/emacs/EmacsNoninteractive.java b/java/org/gnu/emacs/EmacsNoninteractive.java
index 9f2b9fa8b56..8a1ad98d8f9 100644
--- a/java/org/gnu/emacs/EmacsNoninteractive.java
+++ b/java/org/gnu/emacs/EmacsNoninteractive.java
@@ -120,11 +120,11 @@ public final class EmacsNoninteractive
           }
 
         /* Get a LoadedApk or ActivityThread.PackageInfo.  How to do
-           this varies by Android version.  On Android 2.3.3 and
-           earlier, there is no ``compatibilityInfo'' argument to
+           this varies by Android version.  On Android 3.0 and earlier,
+           there is no ``compatibilityInfo'' argument to
            getPackageInfo.  */
 
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1)
+        try
           {
             method
               = activityThreadClass.getMethod ("getPackageInfo",
@@ -134,7 +134,7 @@ public final class EmacsNoninteractive
                                        (Context.CONTEXT_INCLUDE_CODE
                                         | Context.CONTEXT_IGNORE_SECURITY));
           }
-        else
+        catch (NoSuchMethodException exception)
           {
             compatibilityInfoClass
               = Class.forName ("android.content.res.CompatibilityInfo");