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

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

+9 −2

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

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

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

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

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

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