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

Commit 662575c1 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Rename IMMS#mPackageMonitorHandler to mIoHandler 

This is a pure refactoring CL to rename

  InputMethodManagerService#mPackageMonitorHandler

to

  InputMethodManagerService#mIoHandler

to make it clear that we are going to use it not only from

  InputMethodManagerService.MyPackageMonitor

but also from other controllers where we want to perform I/O
operations without holding ImfLock.class.

This is a pure renaming. There must be no observable side effect.

Bug: 343601565
Test: presubmit
Flag: EXEMPT refactor
Change-Id: I3a0e1f27d3dc9c7db68693f1c4a50dfc5c83358e
parent 77e29125

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

+8 −8
Original line number Original line Diff line number Diff line
@@ -322,7 +322,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
    private final Handler mHandler;

    private final Handler mHandler;





    @NonNull

    @NonNull

    private final Handler mPackageMonitorHandler;

    private final Handler mIoHandler;





    @MultiUserUnawareField

    @MultiUserUnawareField

    @UserIdInt

    @UserIdInt
@@ -1237,7 +1237,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
            Context context,

            Context context,

            boolean experimentalConcurrentMultiUserModeEnabled,

            boolean experimentalConcurrentMultiUserModeEnabled,

            @Nullable ServiceThread serviceThreadForTesting,

            @Nullable ServiceThread serviceThreadForTesting,

            @Nullable ServiceThread packageMonitorThreadForTesting,

            @Nullable ServiceThread ioThreadForTesting,

            @Nullable IntFunction<InputMethodBindingController> bindingControllerForTesting) {

            @Nullable IntFunction<InputMethodBindingController> bindingControllerForTesting) {

        synchronized (ImfLock.class) {

        synchronized (ImfLock.class) {

            mExperimentalConcurrentMultiUserModeEnabled =

            mExperimentalConcurrentMultiUserModeEnabled =
@@ -1258,15 +1258,15 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
            thread.start();

            thread.start();

            mHandler = Handler.createAsync(thread.getLooper(), this);

            mHandler = Handler.createAsync(thread.getLooper(), this);

            {

            {

                final ServiceThread packageMonitorThread =

                final ServiceThread ioThread =

                        packageMonitorThreadForTesting != null

                        ioThreadForTesting != null

                                ? packageMonitorThreadForTesting

                                ? ioThreadForTesting

                                : new ServiceThread(

                                : new ServiceThread(

                                        PACKAGE_MONITOR_THREAD_NAME,

                                        PACKAGE_MONITOR_THREAD_NAME,

                                        Process.THREAD_PRIORITY_FOREGROUND,

                                        Process.THREAD_PRIORITY_FOREGROUND,

                                        true /* allowIo */);

                                        true /* allowIo */);

                packageMonitorThread.start();

                ioThread.start();

                mPackageMonitorHandler = Handler.createAsync(packageMonitorThread.getLooper());

                mIoHandler = Handler.createAsync(ioThread.getLooper());

            }

            }

            SystemLocaleWrapper.onStart(context, this::onActionLocaleChanged, mHandler);

            SystemLocaleWrapper.onStart(context, this::onActionLocaleChanged, mHandler);

            mImeTrackerService = new ImeTrackerService(serviceThreadForTesting != null

            mImeTrackerService = new ImeTrackerService(serviceThreadForTesting != null
@@ -1537,7 +1537,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
                    }

                    }

                }, "Lazily initialize IMMS#mImeDrawsImeNavBarRes");

                }, "Lazily initialize IMMS#mImeDrawsImeNavBarRes");





                mMyPackageMonitor.register(mContext, UserHandle.ALL, mPackageMonitorHandler);

                mMyPackageMonitor.register(mContext, UserHandle.ALL, mIoHandler);

                mSettingsObserver.registerContentObserverLocked(currentUserId);

                mSettingsObserver.registerContentObserverLocked(currentUserId);





                final IntentFilter broadcastFilterForAllUsers = new IntentFilter();

                final IntentFilter broadcastFilterForAllUsers = new IntentFilter();

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ final class InputMethodSettingsRepository { 
                                    userId,

                                    userId,

                                    AdditionalSubtypeMapRepository.get(userId),

                                    AdditionalSubtypeMapRepository.get(userId),

                                    DirectBootAwareness.AUTO);

                                    DirectBootAwareness.AUTO);

                    sPerUserMap.put(userId, settings);

                    put(userId, settings);

                }

                }

            }

            }

        });

        });

services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -127,7 +127,7 @@ public class InputMethodManagerServiceTestBase { 
    protected IInputMethodInvoker mMockInputMethodInvoker;

    protected IInputMethodInvoker mMockInputMethodInvoker;

    protected InputMethodManagerService mInputMethodManagerService;

    protected InputMethodManagerService mInputMethodManagerService;

    protected ServiceThread mServiceThread;

    protected ServiceThread mServiceThread;

    protected ServiceThread mPackageMonitorThread;

    protected ServiceThread mIoThread;

    protected boolean mIsLargeScreen;

    protected boolean mIsLargeScreen;

    private InputManagerGlobal.TestSession mInputManagerGlobalSession;

    private InputManagerGlobal.TestSession mInputManagerGlobalSession;
@@ -226,14 +226,14 @@ public class InputMethodManagerServiceTestBase { 
                        "immstest1",

                        "immstest1",

                        Process.THREAD_PRIORITY_FOREGROUND,

                        Process.THREAD_PRIORITY_FOREGROUND,

                        true /* allowIo */);

                        true /* allowIo */);

        mPackageMonitorThread =

        mIoThread =

                new ServiceThread(

                new ServiceThread(

                        "immstest2",

                        "immstest2",

                        Process.THREAD_PRIORITY_FOREGROUND,

                        Process.THREAD_PRIORITY_FOREGROUND,

                        true /* allowIo */);

                        true /* allowIo */);

        mInputMethodManagerService = new InputMethodManagerService(mContext,

        mInputMethodManagerService = new InputMethodManagerService(mContext,

                InputMethodManagerService.shouldEnableExperimentalConcurrentMultiUserMode(mContext),

                InputMethodManagerService.shouldEnableExperimentalConcurrentMultiUserMode(mContext),

                mServiceThread, mPackageMonitorThread,

                mServiceThread, mIoThread,

                unusedUserId -> mMockInputMethodBindingController);

                unusedUserId -> mMockInputMethodBindingController);

        spyOn(mInputMethodManagerService);

        spyOn(mInputMethodManagerService);
@@ -267,8 +267,8 @@ public class InputMethodManagerServiceTestBase { 
            mInputMethodManagerService.mInputMethodDeviceConfigs.destroy();

            mInputMethodManagerService.mInputMethodDeviceConfigs.destroy();

        }

        }





        if (mPackageMonitorThread != null) {

        if (mIoThread != null) {

            mPackageMonitorThread.quitSafely();

            mIoThread.quitSafely();

        }

        }





        if (mServiceThread != null) {

        if (mServiceThread != null) {