Update Android port

* java/org/gnu/emacs/EmacsDrawLine.java: Fix this again.  Gosh,
how does Android do this.
* java/org/gnu/emacs/EmacsNoninteractive.java (main): Port to
Android 2.3.3.

* java/org/gnu/emacs/EmacsSdk11Clipboard.java
(EmacsSdk11Clipboard): Port to Android 4.0.3.
* java/org/gnu/emacs/EmacsService.java (getClipboardManager):
New function.

* src/alloc.c (find_string_data_in_pure): Fix Android alignment
issue.

* src/android-emacs.c (main): Port to Android 4.4.
* src/android.c (initEmacs): Align stack to 32 bytes, so it ends
up aligned to 16 even though gcc thinks the stack is already
aligned to 16 bytes.

* src/callproc.c (init_callproc): Use /system/bin/sh instead of
/bin/sh by default.

4 files changed, 72 insertions, 14 deletions

diff --git a/java/org/gnu/emacs/EmacsDrawLine.java b/java/org/gnu/emacs/EmacsDrawLine.java
index 717e2279a7d..c6e5123bfca 100644
--- a/java/org/gnu/emacs/EmacsDrawLine.java
+++ b/java/org/gnu/emacs/EmacsDrawLine.java
@@ -60,7 +60,7 @@ public class EmacsDrawLine
        coordinates appropriately.  */
 
     if (gc.clip_mask == null)
-      canvas.drawLine ((float) x + 0.5f, (float) y + 0.5f,
+      canvas.drawLine ((float) x, (float) y + 0.5f,
                        (float) x2 + 0.5f, (float) y2 + 0.5f,
                        paint);
 
diff --git a/java/org/gnu/emacs/EmacsNoninteractive.java b/java/org/gnu/emacs/EmacsNoninteractive.java
index a3aefee5e0b..b4854d8323f 100644
--- a/java/org/gnu/emacs/EmacsNoninteractive.java
+++ b/java/org/gnu/emacs/EmacsNoninteractive.java
@@ -95,7 +95,7 @@ public class EmacsNoninteractive
            On Android 2.3.3 and earlier, there is no
            ``compatibilityInfo'' argument to getPackageInfo.  */
 
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD)
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1)
           {
             method
               = activityThreadClass.getMethod ("getPackageInfo",
@@ -123,11 +123,29 @@ public class EmacsNoninteractive
 
         /* Now, get a context.  */
         contextImplClass = Class.forName ("android.app.ContextImpl");
-        method = contextImplClass.getDeclaredMethod ("createAppContext",
-                                                     activityThreadClass,
-                                                     loadedApkClass);
-        method.setAccessible (true);
-        context = (Context) method.invoke (null, activityThread, loadedApk);
+
+        try
+          {
+            method = contextImplClass.getDeclaredMethod ("createAppContext",
+                                                         activityThreadClass,
+                                                         loadedApkClass);
+            method.setAccessible (true);
+            context = (Context) method.invoke (null, activityThread, loadedApk);
+          }
+        catch (NoSuchMethodException exception)
+          {
+            /* Older Android versions don't have createAppContext, but
+               instead require creating a ContextImpl, and then
+               calling createPackageContext.  */
+            method = activityThreadClass.getDeclaredMethod ("getSystemContext");
+            context = (Context) method.invoke (activityThread);
+            method = contextImplClass.getDeclaredMethod ("createPackageContext",
+                                                         String.class,
+                                                         int.class);
+            method.setAccessible (true);
+            context = (Context) method.invoke (context, "org.gnu.emacs",
+                                               0);
+          }
 
         /* Don't actually start the looper or anything.  Instead, obtain
            an AssetManager.  */
diff --git a/java/org/gnu/emacs/EmacsSdk11Clipboard.java b/java/org/gnu/emacs/EmacsSdk11Clipboard.java
index 0a725200723..2df2015c9c1 100644
--- a/java/org/gnu/emacs/EmacsSdk11Clipboard.java
+++ b/java/org/gnu/emacs/EmacsSdk11Clipboard.java
@@ -42,13 +42,7 @@ public class EmacsSdk11Clipboard extends EmacsClipboard
   public
   EmacsSdk11Clipboard ()
   {
-    String what;
-    Context context;
-
-    what = Context.CLIPBOARD_SERVICE;
-    context = EmacsService.SERVICE;
-    manager
-      = (ClipboardManager) context.getSystemService (what);
+    manager = EmacsService.SERVICE.getClipboardManager ();
     manager.addPrimaryClipChangedListener (this);
   }
 
diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 91db76b08e3..eb9b61dd876 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -39,6 +39,7 @@ import android.app.NotificationChannel;
 import android.app.PendingIntent;
 import android.app.Service;
 
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -565,4 +566,49 @@ public class EmacsService extends Service
 
     return null;
   }
+
+  /* Get a SDK 11 ClipboardManager.
+
+     Android 4.0.x requires that this be called from the main
+     thread.  */
+
+  public ClipboardManager
+  getClipboardManager ()
+  {
+    final Holder<ClipboardManager> manager;
+    Runnable runnable;
+
+    manager = new Holder<ClipboardManager> ();
+
+    runnable = new Runnable () {
+        public void
+        run ()
+        {
+          Object tem;
+
+          synchronized (this)
+            {
+              tem = getSystemService (Context.CLIPBOARD_SERVICE);
+              manager.thing = (ClipboardManager) tem;
+              notify ();
+            }
+        }
+      };
+
+    synchronized (runnable)
+      {
+        runOnUiThread (runnable);
+
+        try
+          {
+            runnable.wait ();
+          }
+        catch (InterruptedException e)
+          {
+            EmacsNative.emacsAbort ();
+          }
+      }
+
+    return manager.thing;
+  }
 };