commit 3ff1a5928f2d5bdd911ac59f8064ba35114dc2ec
author The Android Open Source Project <initial-contribution@android.com> Tue Jun 15 11:44:09 2010 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Jun 15 11:44:09 2010 -0700
tree c8a86876a46a95c4e88fc46f1ed0e53f634f028f
parent 7d10df4e2402c55dc827cb6675a15957071c00af
parent 879becf57040d3785028eb34974cf93b0d85e861

merge from open-source master

Change-Id: Ib9ec3f3b7418d064b643577156d7d16688b3048d

services/java/com/android/server/KeyInputQueue.java

diff --git a/services/java/com/android/server/KeyInputQueue.java b/services/java/com/android/server/KeyInputQueue.java
index f30346b..6d42141 100644
--- a/services/java/com/android/server/KeyInputQueue.java
+++ b/services/java/com/android/server/KeyInputQueue.java
@@ -310,7 +310,9 @@
         mLast = new QueuedEvent();
         mFirst.next = mLast;
         mLast.prev = mFirst;
+    }
 
+    void start() {
         mThread.start();
     }
 

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 3af77d5..88463b0 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -667,6 +667,7 @@
         }
 
         mInputThread.start();
+        mQueue.start();
 
         // Add ourself to the Watchdog monitors.
         Watchdog.getInstance().addMonitor(this);