am 2af7b915: Merge "Redraw all windows earlier in power on sequence." into jb-dev

* commit '2af7b9151f8df3581e38847ac711185426df5dea':
  Redraw all windows earlier in power on sequence.

1 files changed, 3 insertions, 4 deletions

diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index d9e0ec6..b1612a1 100755
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -6621,15 +6621,14 @@ public class WindowManagerService extends IWindowManager.Stub
 
     public void setEventDispatching(boolean enabled) {
         if (!checkCallingPermission(android.Manifest.permission.MANAGE_APP_TOKENS,
-                "resumeKeyDispatching()")) {
+                "setEventDispatching()")) {
             throw new SecurityException("Requires MANAGE_APP_TOKENS permission");
         }
 
         synchronized (mWindowMap) {
             mInputMonitor.setEventDispatchingLw(enabled);
+            sendScreenStatusToClientsLocked();
         }
-
-        sendScreenStatusToClients();
     }
 
     public IBinder getFocusedWindowClientToken() {
@@ -6735,7 +6734,7 @@ public class WindowManagerService extends IWindowManager.Stub
         mPolicy.systemReady();
     }
 
-    private void sendScreenStatusToClients() {
+    private void sendScreenStatusToClientsLocked() {
         final ArrayList<WindowState> windows = mWindows;
         final int count = windows.size();
         boolean on = mPowerManager.isScreenOn();