summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-15 11:44:09 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-15 11:44:09 -0700
commit3ff1a5928f2d5bdd911ac59f8064ba35114dc2ec (patch)
treec8a86876a46a95c4e88fc46f1ed0e53f634f028f /services
parent7d10df4e2402c55dc827cb6675a15957071c00af (diff)
parent879becf57040d3785028eb34974cf93b0d85e861 (diff)
downloadframeworks_base-3ff1a5928f2d5bdd911ac59f8064ba35114dc2ec.zip
frameworks_base-3ff1a5928f2d5bdd911ac59f8064ba35114dc2ec.tar.gz
frameworks_base-3ff1a5928f2d5bdd911ac59f8064ba35114dc2ec.tar.bz2
merge from open-source master
Change-Id: Ib9ec3f3b7418d064b643577156d7d16688b3048d
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/KeyInputQueue.java2
-rw-r--r--services/java/com/android/server/WindowManagerService.java1
2 files changed, 3 insertions, 0 deletions
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 @@ public abstract class KeyInputQueue {
mLast = new QueuedEvent();
mFirst.next = mLast;
mLast.prev = mFirst;
+ }
+ void start() {
mThread.start();
}
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 @@ public class WindowManagerService extends IWindowManager.Stub
}
mInputThread.start();
+ mQueue.start();
// Add ourself to the Watchdog monitors.
Watchdog.getInstance().addMonitor(this);