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

This commit is contained in:
TreeHugger Robot
2019-04-15 12:42:30 +00:00
committed by Android (Google) Code Review

View File

@@ -6480,9 +6480,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
*/ */
@Override @Override
public void onImeWindowSetOnDisplay(final int pid, final int displayId) { public void onImeWindowSetOnDisplay(final int pid, final int displayId) {
// Update display configuration for IME process only when Single-client IME window // Don't update process-level configuration for Multi-Client IME process since other
// moving to another display. // IMEs on other displays will also receive this configuration change due to IME
if (!InputMethodSystemProperty.MULTI_CLIENT_IME_ENABLED) return; // services use the same application config/context.
if (InputMethodSystemProperty.MULTI_CLIENT_IME_ENABLED) return;
if (pid == MY_PID || pid < 0) { if (pid == MY_PID || pid < 0) {
if (DEBUG_CONFIGURATION) { if (DEBUG_CONFIGURATION) {