summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 10f09227a186..264eedafc56e 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -4556,12 +4556,10 @@ public class WindowManagerService extends IWindowManager.Stub
lastFocus = displayContent.mLastFocus;
newFocus = displayContent.mCurrentFocus;
- }
- if (lastFocus == newFocus) {
- // Focus is not changing, so nothing to do.
- return;
- }
- synchronized (mGlobalLock) {
+ if (lastFocus == newFocus) {
+ // Focus is not changing, so nothing to do.
+ return;
+ }
displayContent.mLastFocus = newFocus;
if (DEBUG_FOCUS_LIGHT) Slog.i(TAG_WM, "Focus moving from " + lastFocus +
" to " + newFocus + " displayId=" + displayContent.getDisplayId());