Correct earlier changes to processing of Num Lock on Android

* java/org/gnu/emacs/EmacsWindow.java (onKeyDown, onKeyUp):
Cease stripping META_NUM_LOCK_ON and META_SCROLL_LOCK_ON from
meta masks reported to getUnicodeChar.

(cherry picked from commit af6df8e0454f3f51d3855683216dfd12843e6959)

diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java
index e780f401adc983adce16766e8c740897b370abfc..7e90675d9be83dd20cea65960f2221bb9c8483af 100644 (file)
--- a/java/org/gnu/emacs/EmacsWindow.java
+++ b/java/org/gnu/emacs/EmacsWindow.java
@@ -691,13 +691,10 @@ public final class EmacsWindow extends EmacsHandleObject
 
     state = eventModifiers (event);
 
-    /* Num Lock, Scroll Lock and Meta aren't supported by systems older
-       than Android 3.0. */
+    /* Meta isn't supported by systems older than Android 3.0.  */
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
-      extra_ignored = (KeyEvent.META_NUM_LOCK_ON
-                      | KeyEvent.META_SCROLL_LOCK_ON
-                      | KeyEvent.META_META_MASK);
+      extra_ignored = KeyEvent.META_META_MASK;
     else
       extra_ignored = 0;
 
@@ -748,13 +745,10 @@ public final class EmacsWindow extends EmacsHandleObject
     /* Compute the event's modifier mask.  */
     state = eventModifiers (event);
 
-    /* Num Lock, Scroll Lock and Meta aren't supported by systems older
-       than Android 3.0. */
+    /* Meta isn't supported by systems older than Android 3.0.  */
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
-      extra_ignored = (KeyEvent.META_NUM_LOCK_ON
-                      | KeyEvent.META_SCROLL_LOCK_ON
-                      | KeyEvent.META_META_MASK);
+      extra_ignored = KeyEvent.META_META_MASK;
     else
       extra_ignored = 0;