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

Commit 14f523be authored by Chaitanya Cheemala (xWF)'s avatar Chaitanya Cheemala (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Avoid calling syncInputTransactions within wm lock" 

This reverts commit 4d0431dd.

Reason for revert: Likely culprit for b/440236494 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug: 440236494
Change-Id: I1c1c27f1cc2e10fc8ee9b6475ad28023d373debf
parent 4d0431dd

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

+4 −7
Original line number Diff line number Diff line
@@ -9055,7 +9055,6 @@ public class WindowManagerService extends IWindowManager.Stub 


        @Override

        public boolean moveFocusToAdjacentEmbeddedActivityIfNeeded() {

            boolean focusMoved = false;

            synchronized (mGlobalLock) {

                final WindowState focusedWindow = getFocusedWindow();

                if (focusedWindow == null) {
@@ -9064,14 +9063,12 @@ public class WindowManagerService extends IWindowManager.Stub 


                if (moveFocusToAdjacentEmbeddedWindow(focusedWindow)) {

                    // Sync the input transactions to ensure the input focus updates as well.

                    focusMoved = true;

                }

                    syncInputTransactions(false);

                    return true;

                }



            if (focusMoved) {

                syncInputTransactions(false);

                return false;

            }

            return focusMoved;

        }



        @Override
@@ -9768,7 +9765,7 @@ public class WindowManagerService extends IWindowManager.Stub 
     */

    boolean moveFocusToAdjacentEmbeddedWindow(@NonNull WindowState focusedWindow) {

        final ActivityRecord activity = focusedWindow.getActivityRecord();

        if (activity == null || !activity.isVisible()) {

        if (activity == null) {

            return false;

        }