summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2013-02-11 14:39:54 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-02-11 14:39:54 -0800
commitf98e18e68d82dbb508bf2deafa63bcdca643e125 (patch)
treea349f5f0562d25a28195c723ed89c19a17f7db0e
parenta578ade219c07a04f7e8374939734de6ca7cc478 (diff)
parentd9f98c81068594c33c81b5b817391c6b4b895492 (diff)
am d9f98c81: Fix build break due to merge.
# Via Jean-Baptiste Queru * commit 'd9f98c81068594c33c81b5b817391c6b4b895492': Fix build break due to merge.
-rw-r--r--core/java/android/view/ViewRootImpl.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index f2e49c96dac5..3b91e00fe744 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3755,8 +3755,7 @@ public final class ViewRootImpl implements ViewParent,
// find the best view to give focus to in this non-touch-mode with no-focus
View v = focusSearch(null, direction);
if (v != null && v.requestFocus(direction)) {
- finishInputEvent(q, true);
- return;
+ return EVENT_HANDLED;
}
}
}