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

Merge "Drop touch events when no window was touched." into klp-dev

Browse Source
This commit is contained in:
Jeff Brown
2013-08-23 03:08:41 +00:00
committed by Android (Google) Code Review
parent ec7a633086 0b31d812ab
commit 5bc1ea4e4a
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/input/InputDispatcher.cpp
View File

@@ -1275,21 +1275,7 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime,
// Try to assign the pointer to the first foreground window we find, if there is one.
newTouchedWindowHandle = mTempTouchState.getFirstForegroundWindowHandle();
if (newTouchedWindowHandle == NULL) {
// There is no touched window. If this is an initial down event
// then wait for a window to appear that will handle the touch. This is
// to ensure that we report an ANR in the case where an application has started
// but not yet put up a window and the user is starting to get impatient.
if (maskedAction == AMOTION_EVENT_ACTION_DOWN
&& mFocusedApplicationHandle != NULL) {
injectionResult = handleTargetsNotReadyLocked(currentTime, entry,
mFocusedApplicationHandle, NULL, nextWakeupTime,
"Waiting because there is no touchable window that can "
"handle the event but there is focused application that may "
"eventually add a new window when it finishes starting up.");
goto Unresponsive;
}
ALOGI("Dropping event because there is no touched window.");
ALOGI("Dropping event because there is no touchable window at (%d, %d).", x, y);
injectionResult = INPUT_EVENT_INJECTION_FAILED;
goto Failed;
}

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

@@ -312,6 +312,7 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
}
/* Notifies that the input device configuration has changed. */
@Override
public void notifyConfigurationChanged() {
mService.sendNewConfiguration();
@@ -337,12 +338,14 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
}
/* Notifies that the lid switch changed state. */
@Override
public void notifyLidSwitchChanged(long whenNanos, boolean lidOpen) {
mService.mPolicy.notifyLidSwitchChanged(whenNanos, lidOpen);
}
/* Provides an opportunity for the window manager policy to intercept early key
* processing as soon as the key has been read from the device. */
@Override
public int interceptKeyBeforeQueueing(
KeyEvent event, int policyFlags, boolean isScreenOn) {
return mService.mPolicy.interceptKeyBeforeQueueing(event, policyFlags, isScreenOn);
@@ -351,12 +354,14 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
/* Provides an opportunity for the window manager policy to intercept early
* motion event processing when the screen is off since these events are normally
* dropped. */
@Override
public int interceptMotionBeforeQueueingWhenScreenOff(int policyFlags) {
return mService.mPolicy.interceptMotionBeforeQueueingWhenScreenOff(policyFlags);
}
/* Provides an opportunity for the window manager policy to process a key before
* ordinary dispatch. */
@Override
public long interceptKeyBeforeDispatching(
InputWindowHandle focus, KeyEvent event, int policyFlags) {
WindowState windowState = focus != null ? (WindowState) focus.windowState : null;
@@ -365,6 +370,7 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
/* Provides an opportunity for the window manager policy to process a key that
* the application did not handle. */
@Override
public KeyEvent dispatchUnhandledKey(
InputWindowHandle focus, KeyEvent event, int policyFlags) {
WindowState windowState = focus != null ? (WindowState) focus.windowState : null;
@@ -372,6 +378,7 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
}
/* Callback to get pointer layer. */
@Override
public int getPointerLayer() {
return mService.mPolicy.windowTypeToLayerLw(WindowManager.LayoutParams.TYPE_POINTER)
* WindowManagerService.TYPE_LAYER_MULTIPLIER