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

Commit 7576e778 authored by lumark's avatar lumark Committed by android-build-merger
Browse files

Merge "Fix wrong MSIME check in onImeWindowSetOnDisplay." into qt-dev 

am: 49c98a7b

Change-Id: I371879f38f457b50c86175eb46fd21859767401d
parents c6cd7560 49c98a7b

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

+4 −3
Original line number Diff line number Diff line
@@ -6480,9 +6480,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
         */

        @Override

        public void onImeWindowSetOnDisplay(final int pid, final int displayId) {

            // Update display configuration for IME process only when Single-client IME window

            // moving to another display.

            if (!InputMethodSystemProperty.MULTI_CLIENT_IME_ENABLED) return;

            // Don't update process-level configuration for Multi-Client IME process since other

            // IMEs on other displays will also receive this configuration change due to IME

            // services use the same application config/context.

            if (InputMethodSystemProperty.MULTI_CLIENT_IME_ENABLED) return;



            if (pid == MY_PID || pid < 0) {

                if (DEBUG_CONFIGURATION) {