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

Commit fb405fa0 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

Merge "Add missing traceEnd in IMMS#showSoftInput for the invalid call" into udc-dev am: 40078ee5 

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



Change-Id: I9c9f481d96f845cd1e05cdddeb4e3889110de25f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64cb3540 40078ee5

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -3325,6 +3325,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
            if (!canInteractWithImeLocked(uid, client, "showSoftInput", statsToken)) {

            if (!canInteractWithImeLocked(uid, client, "showSoftInput", statsToken)) {

                ImeTracker.forLogging().onFailed(

                ImeTracker.forLogging().onFailed(

                        statsToken, ImeTracker.PHASE_SERVER_CLIENT_FOCUSED);

                        statsToken, ImeTracker.PHASE_SERVER_CLIENT_FOCUSED);

                Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

                return false;

                return false;

            }

            }

            final long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();