Ensure the ShortcutManager uses the correct key character map.

The ShortcutManager used to only receive the key code of the key event
that triggered the shortcut.  This change now provides the shortcut
manager with the whole key event so it can look up the associated
character using the correct key character map.

To make this more efficient, added a mechanism for recycling
key events.  At the moment it is only used by key events owned by the
system process, since clients of the existing API (such as Views)
might continue to hold on to key events after dispatch has finished so
they would break if the key event were recycled by the framework.

Deprecated KeyCharacterMap.BUILT_IN_KEYBOARD.

Change-Id: I4313725dd63f2be01c350c005a41c7fde9bc67e8

1 files changed, 6 insertions, 6 deletions

diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java
index 195d6893e1cb..e81aa982f167 100644
--- a/core/java/android/view/MotionEvent.java
+++ b/core/java/android/view/MotionEvent.java
@@ -314,10 +314,10 @@ public final class MotionEvent extends InputEvent implements Parcelable {
      */
     static private final int BASE_AVAIL_SAMPLES = 8;
     
-    static private final int MAX_RECYCLED = 10;
-    static private Object gRecyclerLock = new Object();
-    static private int gRecyclerUsed = 0;
-    static private MotionEvent gRecyclerTop = null;
+    private static final int MAX_RECYCLED = 10;
+    private static final Object gRecyclerLock = new Object();
+    private static int gRecyclerUsed;
+    private static MotionEvent gRecyclerTop;
 
     private long mDownTimeNano;
     private int mAction;
@@ -361,7 +361,8 @@ public final class MotionEvent extends InputEvent implements Parcelable {
     static private MotionEvent obtain(int pointerCount, int sampleCount) {
         final MotionEvent ev;
         synchronized (gRecyclerLock) {
-            if (gRecyclerTop == null) {
+            ev = gRecyclerTop;
+            if (ev == null) {
                 if (pointerCount < BASE_AVAIL_POINTERS) {
                     pointerCount = BASE_AVAIL_POINTERS;
                 }
@@ -370,7 +371,6 @@ public final class MotionEvent extends InputEvent implements Parcelable {
                 }
                 return new MotionEvent(pointerCount, sampleCount);
             }
-            ev = gRecyclerTop;
             gRecyclerTop = ev.mNext;
             gRecyclerUsed -= 1;
         }