Merge "Don't enable input dispatch until display enabled." into jb-dev (a3a59a2f) · Commits · e / os / android_frameworks_base

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -5285,6 +5285,9 @@ public class WindowManagerService extends IWindowManager.Stub
		} catch (RemoteException ex) {
		Slog.e(TAG, "Boot completed: SurfaceFlinger is dead!");
		}

		// Enable input dispatch.
		mInputMonitor.setEventDispatchingLw(mEventDispatchingEnabled);
		}

		mPolicy.enableScreenAfterBoot();
		@@ -6636,6 +6639,7 @@ public class WindowManagerService extends IWindowManager.Stub
		// -------------------------------------------------------------

		final InputMonitor mInputMonitor = new InputMonitor(this);
		private boolean mEventDispatchingEnabled;

		public void pauseKeyDispatching(IBinder _token) {
		if (!checkCallingPermission(android.Manifest.permission.MANAGE_APP_TOKENS,
		@@ -6672,7 +6676,10 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		synchronized (mWindowMap) {
		mEventDispatchingEnabled = enabled;
		if (mDisplayEnabled) {
		mInputMonitor.setEventDispatchingLw(enabled);
		}
		sendScreenStatusToClientsLocked();
		}
		}