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

Commit 88016bb6 authored by Cosmin Băieș's avatar Cosmin Băieș
Browse files

Simplify showMySoftInput and hideMySoftInput 

Following the changes for IME token validation in [1], this inlines the
nested try-catch blocks to simplify showMySoftInput and hideMySoftInput.

  [1]: I322ae7dbca9c1bb33fdb4992b44b9676bba4abd9

Flag: EXEMPT refactor
Test: atest InputMethodServiceTest#testShowHideSelf
Bug: 355154964
Change-Id: I246d1c20de99eca9f158dec9ba735eabcb9a72fb
parent 9b9990ab

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

+24 −30
Original line number Diff line number Diff line
@@ -4791,9 +4791,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
    private void hideMySoftInputLocked(@NonNull ImeTracker.Token statsToken,

            @InputMethodManager.HideFlags int flags, @SoftInputShowHideReason int reason,

            @NonNull UserData userData) {

        try {

            Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMMS.hideMySoftInputLocked");

        final int userId = userData.mUserId;

        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMMS.hideMySoftInputLocked");

        final long ident = Binder.clearCallingIdentity();

        try {

            if (Flags.refactorInsetsController()) {
@@ -4807,8 +4806,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
            }

        } finally {

            Binder.restoreCallingIdentity(ident);

            }

        } finally {

            Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

        }

    }
@@ -4818,9 +4815,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
    private void showMySoftInputLocked(@NonNull ImeTracker.Token statsToken,

            @InputMethodManager.ShowFlags int flags, @SoftInputShowHideReason int reason,

            @NonNull UserData userData) {

        try {

            Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMMS.showMySoftInputLocked");

        final int userId = userData.mUserId;

        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMMS.showMySoftInputLocked");

        final long ident = Binder.clearCallingIdentity();

        try {

            if (Flags.refactorInsetsController()) {
@@ -4834,8 +4830,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
            }

        } finally {

            Binder.restoreCallingIdentity(ident);

            }

        } finally {

            Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

        }

    }