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

am d4cf7e7b: Merge "Don\'t ANR on hover, scroll or if a window goes away." into jb-dev

Browse Source 
* commit 'd4cf7e7b06e6870d447dbed2683b8849cfe5336b':
  Don't ANR on hover, scroll or if a window goes away.
This commit is contained in:
Jeff Brown
2012-05-25 18:41:20 -07:00
committed by Android Git Automerger
parent 9d8933ec11 d4cf7e7b06
commit 9026fecd51
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
services/input/InputDispatcher.cpp
View File

@@ -1226,27 +1226,36 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime,
isSplit = true; isSplit = true;
} else if (isSplit) { } else if (isSplit) {
// New window does not support splitting but we have already split events. // New window does not support splitting but we have already split events.
// Assign the pointer to the first foreground window we find. // Ignore the new window.
// (May be NULL which is why we put this code block before the next check.) newTouchedWindowHandle = NULL;
newTouchedWindowHandle = mTempTouchState.getFirstForegroundWindowHandle();
} }
// If we did not find a touched window then fail. // Handle the case where we did not find a window.
if (newTouchedWindowHandle == NULL) { if (newTouchedWindowHandle == NULL) {
if (mFocusedApplicationHandle != NULL) { // 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) {
#if DEBUG_FOCUS #if DEBUG_FOCUS
ALOGD("Waiting because there is no touched window but there is a " ALOGD("Waiting because there is no touched window but there is a "
"focused application that may eventually add a new window: %s.", "focused application that may eventually add a new window: %s.",
getApplicationWindowLabelLocked(mFocusedApplicationHandle, NULL).string()); getApplicationWindowLabelLocked(
mFocusedApplicationHandle, NULL).string());
#endif #endif
injectionResult = handleTargetsNotReadyLocked(currentTime, entry, injectionResult = handleTargetsNotReadyLocked(currentTime, entry,
mFocusedApplicationHandle, NULL, nextWakeupTime); mFocusedApplicationHandle, NULL, nextWakeupTime);
goto Unresponsive; goto Unresponsive;
} }
ALOGI("Dropping event because there is no touched window or focused application."); ALOGI("Dropping event because there is no touched window.");
injectionResult = INPUT_EVENT_INJECTION_FAILED; injectionResult = INPUT_EVENT_INJECTION_FAILED;
goto Failed; goto Failed;
}
} }
// Set target flags. // Set target flags.