From 9cf166db63b7383a94dc47a6a5251c0dbe1dae9b Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Mon, 31 Jul 2023 14:18:12 +0800
Subject: Initialize Android API level earlier

* java/org/gnu/emacs/EmacsNative.java (EmacsNative):
* java/org/gnu/emacs/EmacsNoninteractive.java (main):
* java/org/gnu/emacs/EmacsService.java (run):
* java/org/gnu/emacs/EmacsThread.java (run):
* src/android.c (initEmacs, setEmacsParams): Set
`android_api_level' within setEmacsParams, not in initEmacs.
* src/androidvfs.c: Pacify compiler warnings.
---
 java/org/gnu/emacs/EmacsNative.java         | 14 +++++++-------
 java/org/gnu/emacs/EmacsNoninteractive.java |  6 +++---
 java/org/gnu/emacs/EmacsService.java        |  3 ++-
 java/org/gnu/emacs/EmacsThread.java         |  4 +---
 4 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'java/org/gnu')

diff --git a/java/org/gnu/emacs/EmacsNative.java b/java/org/gnu/emacs/EmacsNative.java
index ea200037218..7d72a9f192e 100644
--- a/java/org/gnu/emacs/EmacsNative.java
+++ b/java/org/gnu/emacs/EmacsNative.java
@@ -66,7 +66,9 @@ public final class EmacsNative
      classPath must be the classpath of this app_process process, or
      NULL.
 
-     emacsService must be the EmacsService singleton, or NULL.  */
+     emacsService must be the EmacsService singleton, or NULL.
+
+     apiLevel is the version of Android being run.  */
   public static native void setEmacsParams (AssetManager assetManager,
 					    String filesDir,
 					    String libDir,
@@ -75,18 +77,16 @@ public final class EmacsNative
 					    float pixelDensityY,
 					    float scaledDensity,
 					    String classPath,
-					    EmacsService emacsService);
+					    EmacsService emacsService,
+					    int apiLevel);
 
   /* Initialize Emacs with the argument array ARGV.  Each argument
      must contain a NULL terminated string, or else the behavior is
      undefined.
 
      DUMPFILE is the dump file to use, or NULL if Emacs is to load
-     loadup.el itself.
-
-     APILEVEL is the version of Android being used.  */
-  public static native void initEmacs (String argv[], String dumpFile,
-				       int apiLevel);
+     loadup.el itself.  */
+  public static native void initEmacs (String argv[], String dumpFile);
 
   /* Abort and generate a native core dump.  */
   public static native void emacsAbort ();
diff --git a/java/org/gnu/emacs/EmacsNoninteractive.java b/java/org/gnu/emacs/EmacsNoninteractive.java
index aa6fa41ba97..1c7513e1cc9 100644
--- a/java/org/gnu/emacs/EmacsNoninteractive.java
+++ b/java/org/gnu/emacs/EmacsNoninteractive.java
@@ -190,14 +190,14 @@ public final class EmacsNoninteractive
 
     EmacsNative.setEmacsParams (assets, filesDir,
 				libDir, cacheDir, 0.0f,
-				0.0f, 0.0f, null, null);
+				0.0f, 0.0f, null, null,
+				Build.VERSION.SDK_INT);
 
     /* Now find the dump file that Emacs should use, if it has already
        been dumped.  */
     EmacsApplication.findDumpFile (context);
 
     /* Start Emacs.  */
-    EmacsNative.initEmacs (args, EmacsApplication.dumpFileName,
-			   Build.VERSION.SDK_INT);
+    EmacsNative.initEmacs (args, EmacsApplication.dumpFileName);
   }
 };
diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index e714f75fdf2..3c1bb0855f4 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -291,7 +291,8 @@ public final class EmacsService extends Service
 					  cacheDir, (float) pixelDensityX,
 					  (float) pixelDensityY,
 					  (float) scaledDensity,
-					  classPath, EmacsService.this);
+					  classPath, EmacsService.this,
+					  Build.VERSION.SDK_INT);
 	    }
 	  }, extraStartupArgument,
 	  /* If any file needs to be opened, open it now.  */
diff --git a/java/org/gnu/emacs/EmacsThread.java b/java/org/gnu/emacs/EmacsThread.java
index c003ea95c50..5307015b46f 100644
--- a/java/org/gnu/emacs/EmacsThread.java
+++ b/java/org/gnu/emacs/EmacsThread.java
@@ -22,7 +22,6 @@ package org.gnu.emacs;
 import java.lang.Thread;
 import java.util.Arrays;
 
-import android.os.Build;
 import android.util.Log;
 
 public final class EmacsThread extends Thread
@@ -78,7 +77,6 @@ public final class EmacsThread extends Thread
 
     /* Run the native code now.  */
     Log.d (TAG, "run: " + Arrays.toString (args));
-    EmacsNative.initEmacs (args, EmacsApplication.dumpFileName,
-			   Build.VERSION.SDK_INT);
+    EmacsNative.initEmacs (args, EmacsApplication.dumpFileName);
   }
 };
-- 
cgit v1.2.1