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

Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2012-09-12 17:04:41 -07:00
committed by Android (Google) Code Review
parent 39de2b0e19 8d5e6f8d4a
commit 3c78702db5
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/view/ViewRootImpl.java
View File

@@ -3612,8 +3612,31 @@ public final class ViewRootImpl implements ViewParent,
finishInputEvent(q, true);
} else {
if (q.mEvent instanceof KeyEvent) {
KeyEvent event = (KeyEvent)q.mEvent;
if (event.getAction() != KeyEvent.ACTION_UP) {
// If the window doesn't currently have input focus, then drop
// this event. This could be an event that came back from the
// IME dispatch but the window has lost focus in the meantime.
if (!mAttachInfo.mHasWindowFocus) {
Slog.w(TAG, "Dropping event due to no window focus: " + event);
finishInputEvent(q, true);
return;
}
}
deliverKeyEventPostIme(q);
} else {
MotionEvent event = (MotionEvent)q.mEvent;
if (event.getAction() != MotionEvent.ACTION_CANCEL
&& event.getAction() != MotionEvent.ACTION_UP) {
// If the window doesn't currently have input focus, then drop
// this event. This could be an event that came back from the
// IME dispatch but the window has lost focus in the meantime.
if (!mAttachInfo.mHasWindowFocus) {
Slog.w(TAG, "Dropping event due to no window focus: " + event);
finishInputEvent(q, true);
return;
}
}
final int source = q.mEvent.getSource();
if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) {
deliverTrackballEventPostIme(q);