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

Commit 5aa8c0d2 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Set focus to WMS computed focus when embedded window drops focus" into tm-dev am: 823b164e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18143057



Change-Id: Id384ee5902ebf9c7cda5bbfe4b542f88989cf4a8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7addf92f 823b164e

data/etc/services.core.protolog.json

+6 −6
Original line number Diff line number Diff line
@@ -2581,12 +2581,6 @@ 
      "group": "WM_DEBUG_ANIM",

      "at": "com\/android\/server\/wm\/WindowContainer.java"

    },

    "397105698": {

      "message": "grantEmbeddedWindowFocus remove request for win=%s dropped since no candidate was found",

      "level": "VERBOSE",

      "group": "WM_DEBUG_FOCUS",

      "at": "com\/android\/server\/wm\/WindowManagerService.java"

    },

    "397382873": {

      "message": "Moving to PAUSED: %s %s",

      "level": "VERBOSE",
@@ -3115,6 +3109,12 @@ 
      "group": "WM_DEBUG_LOCKTASK",

      "at": "com\/android\/server\/wm\/LockTaskController.java"

    },

    "958338552": {

      "message": "grantEmbeddedWindowFocus win=%s dropped focus so setting focus to null since no candidate was found",

      "level": "VERBOSE",

      "group": "WM_DEBUG_FOCUS",

      "at": "com\/android\/server\/wm\/WindowManagerService.java"

    },

    "959486822": {

      "message": "setSyncGroup #%d on %s",

      "level": "VERBOSE",

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

+7 −5
Original line number Diff line number Diff line
@@ -8877,16 +8877,18 @@ public class WindowManagerService extends IWindowManager.Stub 
                WindowState newFocusTarget =  displayContent == null

                        ? null : displayContent.findFocusedWindow();

                if (newFocusTarget == null) {

                    ProtoLog.v(WM_DEBUG_FOCUS, "grantEmbeddedWindowFocus remove request for "

                                    + "win=%s dropped since no candidate was found",

                    t.setFocusedWindow(null, null, displayId).apply();

                    ProtoLog.v(WM_DEBUG_FOCUS, "grantEmbeddedWindowFocus win=%s"

                                    + " dropped focus so setting focus to null since no candidate"

                                    + " was found",

                            embeddedWindow);

                    return;

                }

                t.requestFocusTransfer(newFocusTarget.mInputChannelToken, newFocusTarget.getName(),

                        inputToken, embeddedWindow.toString(),

                t.setFocusedWindow(newFocusTarget.mInputChannelToken, newFocusTarget.getName(),

                        displayId).apply();



                EventLog.writeEvent(LOGTAG_INPUT_FOCUS,

                        "Transfer focus request " + newFocusTarget,

                        "Focus request " + newFocusTarget,

                        "reason=grantEmbeddedWindowFocus(false)");

            }

            ProtoLog.v(WM_DEBUG_FOCUS, "grantEmbeddedWindowFocus win=%s grantFocus=%s",