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

Commit 7690c4f1 authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge changes I7a2cc49e,I246d1c20,I322ae7db,I6ca8cd8e into main 

* changes:
  Move clearCallingIdentity to priviliged operations
  Simplify showMySoftInput and hideMySoftInput
  Move IME token validation to privilegedOperations
  Cleanup IME token validation in IMMS
parents 87ffd438 11dc30d3

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -112,7 +112,8 @@ final class IInputMethodInvoker { 
    }

    }





    @AnyThread

    @AnyThread

    void initializeInternal(IBinder token, IInputMethodPrivilegedOperations privilegedOperations,

    void initializeInternal(@NonNull IBinder token,

            @NonNull IInputMethodPrivilegedOperations privilegedOperations,

            @InputMethodNavButtonFlags int navigationBarFlags) {

            @InputMethodNavButtonFlags int navigationBarFlags) {

        final IInputMethod.InitParams params = new IInputMethod.InitParams();

        final IInputMethod.InitParams params = new IInputMethod.InitParams();

        params.token = token;

        params.token = token;

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

+414 −449

File changed.

Preview size limit exceeded, changes collapsed.