Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68407889 authored by Tarandeep Singh's avatar Tarandeep Singh
Browse files

Fix synchronization in updateImeTargetWindow 

Use lock before accessing Window map and calling
DC.updateImeControlTarget().

Change-Id: I363e3a96fc6041df9b25c649de6bda0a70d40857
Fix: 149491593
Bug: 111084606
Test: atest CtsInputMethodTestCases
parent b0f1fe88

services/core/java/com/android/server/wm/WindowManagerService.java

+5 −3
Original line number Diff line number Diff line
@@ -7317,11 +7317,13 @@ public class WindowManagerService extends IWindowManager.Stub 
                Slog.w(TAG_WM, "updateInputMethodTargetWindow: imeToken=" + imeToken

                        + " imeTargetWindowToken=" + imeTargetWindowToken);

            }

            synchronized (mGlobalLock) {

                final WindowState imeTarget = mWindowMap.get(imeTargetWindowToken);

                if (imeTarget != null) {

                    imeTarget.getDisplayContent().updateImeControlTarget(imeTarget);

                }

            }

        }



        @Override

        public boolean isHardKeyboardAvailable() {