Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't enable input dispatch until display enabled." into jb-dev

Browse Source
This commit is contained in:
Jeff Brown
2012-06-25 15:26:14 -07:00
committed by Android (Google) Code Review
parent b032f9fc9d 08a746a0c6
commit a3a59a2fa7
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -5285,6 +5285,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();
@@ -6636,6 +6639,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,
@@ -6672,7 +6676,10 @@ public class WindowManagerService extends IWindowManager.Stub
} }
synchronized (mWindowMap) { synchronized (mWindowMap) {
mEventDispatchingEnabled = enabled;
if (mDisplayEnabled) {
mInputMonitor.setEventDispatchingLw(enabled); mInputMonitor.setEventDispatchingLw(enabled);
}
sendScreenStatusToClientsLocked(); sendScreenStatusToClientsLocked();
} }
} }