summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2014-12-05 00:45:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-05 00:45:51 +0000
commited068f7c3047b3775647a6023c6960a4fc535144 (patch)
tree3497dd50197e220ebdf62990d72f1067c9501b23 /core/java
parent2b6dc199432a574d8655734865b0d75d2140fd8c (diff)
parent3a0d878ab56475276c61d574af7651820a5cea5a (diff)
downloadframeworks_base-ed068f7c3047b3775647a6023c6960a4fc535144.zip
frameworks_base-ed068f7c3047b3775647a6023c6960a4fc535144.tar.gz
frameworks_base-ed068f7c3047b3775647a6023c6960a4fc535144.tar.bz2
am 3a0d878a: Ensure all events from a showing window are dispatched.
* commit '3a0d878ab56475276c61d574af7651820a5cea5a': Ensure all events from a showing window are dispatched.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/Window.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 2e5c1e0..6944c53 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -364,7 +364,7 @@ public abstract class Window {
/**
* This hook is called whenever the window focus changes. See
* {@link View#onWindowFocusChanged(boolean)
- * View.onWindowFocusChanged(boolean)} for more information.
+ * View.onWindowFocusChangedNotLocked(boolean)} for more information.
*
* @param hasFocus Whether the window now has focus.
*/