commit 864b1e007dc741ec10c23cabc0271f97a5b8c598
author Jean-Baptiste Queru <jbq@google.com> Mon Dec 06 10:57:04 2010 -0800
committer Android Code Review <code-review@android.com> Mon Dec 06 10:57:04 2010 -0800
tree 5da61a1e66937e5faead4339417089623d5e3f7e
parent bf1439c513f0d24a9d23755b50750831574785f4
parent f04f7ae73b0a97eb90797ead07553303d0b383f9

Merge "NumberPicker: Set formatter local value to US."

services/java/com/android/server/WindowManagerService.java

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index dd4aeab..6e1b63a 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -5488,12 +5488,13 @@
         int metaState = ev.getMetaState();
         int deviceId = ev.getDeviceId();
         int scancode = ev.getScanCode();
+        int flags = ev.getFlags();
 
         if (eventTime == 0) eventTime = SystemClock.uptimeMillis();
         if (downTime == 0) downTime = eventTime;
 
         KeyEvent newEvent = new KeyEvent(downTime, eventTime, action, code, repeatCount, metaState,
-                deviceId, scancode, KeyEvent.FLAG_FROM_SYSTEM);
+                deviceId, scancode, flags | KeyEvent.FLAG_FROM_SYSTEM);
 
         final int pid = Binder.getCallingPid();
         final int uid = Binder.getCallingUid();