Port better to Android 3.0

* java/org/gnu/emacs/EmacsNoninteractive.java (main): Use the
old getPackageInfo calling convention if it exists rather than
on Android 2.3.3 and earlier.

(cherry picked from commit 34882d524328638e2198952578638e0ffe0697c5)

diff --git a/java/org/gnu/emacs/EmacsNoninteractive.java b/java/org/gnu/emacs/EmacsNoninteractive.java
index 9f2b9fa8b56ca3592f61061437d28f596754b300..8a1ad98d8f9560ff6a6fac4beac54c2d4fab5a92 100644 (file)
--- 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");