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

Commit 1f3edaab authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Inline InputMethodManagerService.MethodCallback 

This CL inlines InputMethodManagerService.MethodCallback as it is
semantically a single-method callback.

This is a mechanical refactoring.  There should be no behavior change.

Bug: 192412909
Test: presubmit
Change-Id: I3d110b905cc9b461d228735c2c5824ed54dceb08
parent 321550e7

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

+11 −24
Original line number Diff line number Diff line
@@ -1464,29 +1464,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        }

    }



    private static final class MethodCallback extends IInputSessionCallback.Stub {

        private final InputMethodManagerService mParentIMMS;

        private final IInputMethod mMethod;

        private final InputChannel mChannel;



        MethodCallback(InputMethodManagerService imms, IInputMethod method,

                InputChannel channel) {

            mParentIMMS = imms;

            mMethod = method;

            mChannel = channel;

        }



        @Override

        public void sessionCreated(IInputMethodSession session) {

            final long ident = Binder.clearCallingIdentity();

            try {

                mParentIMMS.onSessionCreated(mMethod, session, mChannel);

            } finally {

                Binder.restoreCallingIdentity(ident);

            }

        }

    }



    private static final class UserSwitchHandlerTask implements Runnable {

        final InputMethodManagerService mService;
@@ -2607,7 +2584,17 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            IInputMethod curMethod = getCurMethodLocked();

            executeOrSendMessage(curMethod, mCaller.obtainMessageOOO(

                    MSG_CREATE_SESSION, curMethod, channels[1],

                    new MethodCallback(this, curMethod, channels[0])));

                    new IInputSessionCallback.Stub() {

                        @Override

                        public void sessionCreated(IInputMethodSession session) {

                            final long ident = Binder.clearCallingIdentity();

                            try {

                                onSessionCreated(curMethod, session, channels[0]);

                            } finally {

                                Binder.restoreCallingIdentity(ident);

                            }

                        }

                    }));

        }

    }