drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c2d200d4: Merge "Fix focused application handle. (DO NOT MERGE)" into honeycomb-mr2

Browse Source 
* commit 'c2d200d4fbf3b0a39bf7518cd9d97afec061c6bb':
  Fix focused application handle. (DO NOT MERGE)
This commit is contained in:
Jeff Brown
2011-05-25 14:35:42 -07:00
committed by Android Git Automerger
parent 8ea6e6411c c2d200d4fb
commit 32b7bcc877
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/input/InputDispatcher.cpp
View File

@ -1198,7 +1198,7 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime,
mTempTouchState.copyFrom(mTouchState); mTempTouchState.copyFrom(mTouchState);
} }
if (wrongDevice) { if (wrongDevice) {
#if DEBUG_INPUT_DISPATCHER_POLICY #if DEBUG_FOCUS
LOGD("Dropping event because a pointer for a different device is already down."); LOGD("Dropping event because a pointer for a different device is already down.");
#endif #endif
injectionResult = INPUT_EVENT_INJECTION_FAILED; injectionResult = INPUT_EVENT_INJECTION_FAILED;
@ -1318,7 +1318,7 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime,
// If the pointer is not currently down, then ignore the event. // If the pointer is not currently down, then ignore the event.
if (! mTempTouchState.down) { if (! mTempTouchState.down) {
#if DEBUG_INPUT_DISPATCHER_POLICY #if DEBUG_FOCUS
LOGD("Dropping event because the pointer is not down or we previously " LOGD("Dropping event because the pointer is not down or we previously "
"dropped the pointer down event."); "dropped the pointer down event.");
#endif #endif
@ -1343,7 +1343,7 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime,
} }
} }
if (! haveForegroundWindow) { if (! haveForegroundWindow) {
#if DEBUG_INPUT_DISPATCHER_POLICY #if DEBUG_FOCUS
LOGD("Dropping event because there is no touched foreground window to receive it."); LOGD("Dropping event because there is no touched foreground window to receive it.");
#endif #endif
injectionResult = INPUT_EVENT_INJECTION_FAILED; injectionResult = INPUT_EVENT_INJECTION_FAILED;
@ -1360,7 +1360,7 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime,
if (touchedWindow.targetFlags & InputTarget::FLAG_FOREGROUND) { if (touchedWindow.targetFlags & InputTarget::FLAG_FOREGROUND) {
// If the touched window is paused then keep waiting. // If the touched window is paused then keep waiting.
if (touchedWindow.window->paused) { if (touchedWindow.window->paused) {
#if DEBUG_INPUT_DISPATCHER_POLICY #if DEBUG_FOCUS
LOGD("Waiting because touched window is paused."); LOGD("Waiting because touched window is paused.");
#endif #endif
injectionResult = handleTargetsNotReadyLocked(currentTime, entry, injectionResult = handleTargetsNotReadyLocked(currentTime, entry,

1
services/jni/com_android_server_InputManager.cpp
View File

@ -606,6 +606,7 @@ void NativeInputManager::setFocusedApplication(JNIEnv* env, jobject applicationO
android_server_InputApplication_toNative(env, applicationObj, &application); android_server_InputApplication_toNative(env, applicationObj, &application);
if (application.inputApplicationHandle != NULL) { if (application.inputApplicationHandle != NULL) {
mInputManager->getDispatcher()->setFocusedApplication(&application); mInputManager->getDispatcher()->setFocusedApplication(&application);
return;
} }
} }
mInputManager->getDispatcher()->setFocusedApplication(NULL); mInputManager->getDispatcher()->setFocusedApplication(NULL);