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

Commit 7cdbbbe9 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Merge IInputMethodManagerInvoker and IInputMethodManagerGlobalInvoker 

This CL mechanically merges

  IInputMethodManagerInvoker

into

  IInputMethodManagerGlobalInvoker

without changing any observable semantics.  This allows us to remove

  InputMethodManager#mServiceInvoker

completely.

This refactoring makes it much easier for us to see whether a method
in InputMethodManger is implemented only with static methods or not.

Bug: 234882948
Test: presubmit
Change-Id: I310a33f27b876419b6a3058202dcbd663b541079
parent f629ddf2

core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java

+338 −1
Original line number Diff line number Diff line
@@ -17,16 +17,32 @@ 
package android.view.inputmethod;



import android.annotation.AnyThread;

import android.annotation.DurationMillisLong;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresNoPermission;

import android.annotation.RequiresPermission;

import android.annotation.UserIdInt;

import android.content.Context;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.ServiceManager;

import android.view.WindowManager;

import android.window.ImeOnBackInvokedDispatcher;



import com.android.internal.inputmethod.DirectBootAwareness;

import com.android.internal.inputmethod.IInputMethodClient;

import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection;

import com.android.internal.inputmethod.IRemoteInputConnection;

import com.android.internal.inputmethod.InputBindResult;

import com.android.internal.inputmethod.SoftInputShowHideReason;

import com.android.internal.inputmethod.StartInputFlags;

import com.android.internal.inputmethod.StartInputReason;

import com.android.internal.view.IInputMethodManager;



import java.util.ArrayList;

import java.util.List;

import java.util.function.Consumer;



/**
@@ -54,9 +70,12 @@ final class IInputMethodManagerGlobalInvoker { 


    @AnyThread

    @Nullable

    private static IInputMethodManager getService() {

    static IInputMethodManager getService() {

        IInputMethodManager service = sServiceCache;

        if (service == null) {

            if (InputMethodManager.isInEditModeInternal()) {

                return null;

            }

            service = IInputMethodManager.Stub.asInterface(

                    ServiceManager.getService(Context.INPUT_METHOD_SERVICE));

            if (service == null) {
@@ -175,4 +194,322 @@ final class IInputMethodManagerGlobalInvoker { 
            handleRemoteExceptionOrRethrow(e, exceptionHandler);

        }

    }



    @AnyThread

    static void addClient(@NonNull IInputMethodClient client,

            @NonNull IRemoteInputConnection fallbackInputConnection, int untrustedDisplayId) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return;

        }

        try {

            service.addClient(client, fallbackInputConnection, untrustedDisplayId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @NonNull

    static List<InputMethodInfo> getInputMethodList(@UserIdInt int userId,

            @DirectBootAwareness int directBootAwareness) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return new ArrayList<>();

        }

        try {

            return service.getInputMethodList(userId, directBootAwareness);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @NonNull

    static List<InputMethodInfo> getEnabledInputMethodList(@UserIdInt int userId) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return new ArrayList<>();

        }

        try {

            return service.getEnabledInputMethodList(userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @NonNull

    static List<InputMethodSubtype> getEnabledInputMethodSubtypeList(@Nullable String imiId,

            boolean allowsImplicitlyEnabledSubtypes, @UserIdInt int userId) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return new ArrayList<>();

        }

        try {

            return service.getEnabledInputMethodSubtypeList(imiId,

                    allowsImplicitlyEnabledSubtypes, userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @Nullable

    static InputMethodSubtype getLastInputMethodSubtype(@UserIdInt int userId) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return null;

        }

        try {

            return service.getLastInputMethodSubtype(userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static boolean showSoftInput(@NonNull IInputMethodClient client, @Nullable IBinder windowToken,

            int flags, int lastClickToolType, @Nullable ResultReceiver resultReceiver,

            @SoftInputShowHideReason int reason) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return false;

        }

        try {

            return service.showSoftInput(

                    client, windowToken, flags, lastClickToolType, resultReceiver, reason);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static boolean hideSoftInput(@NonNull IInputMethodClient client, @Nullable IBinder windowToken,

            int flags, @Nullable ResultReceiver resultReceiver,

            @SoftInputShowHideReason int reason) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return false;

        }

        try {

            return service.hideSoftInput(client, windowToken, flags, resultReceiver, reason);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @NonNull

    static InputBindResult startInputOrWindowGainedFocus(@StartInputReason int startInputReason,

            @NonNull IInputMethodClient client, @Nullable IBinder windowToken,

            @StartInputFlags int startInputFlags,

            @WindowManager.LayoutParams.SoftInputModeFlags int softInputMode,

            @WindowManager.LayoutParams.Flags int windowFlags, @Nullable EditorInfo editorInfo,

            @Nullable IRemoteInputConnection remoteInputConnection,

            @Nullable IRemoteAccessibilityInputConnection remoteAccessibilityInputConnection,

            int unverifiedTargetSdkVersion, @UserIdInt int userId,

            @NonNull ImeOnBackInvokedDispatcher imeDispatcher) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return InputBindResult.NULL;

        }

        try {

            return service.startInputOrWindowGainedFocus(startInputReason, client, windowToken,

                    startInputFlags, softInputMode, windowFlags, editorInfo, remoteInputConnection,

                    remoteAccessibilityInputConnection, unverifiedTargetSdkVersion, userId,

                    imeDispatcher);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static void showInputMethodPickerFromClient(@NonNull IInputMethodClient client,

            int auxiliarySubtypeMode) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return;

        }

        try {

            service.showInputMethodPickerFromClient(client, auxiliarySubtypeMode);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static void showInputMethodPickerFromSystem(@NonNull IInputMethodClient client,

            int auxiliarySubtypeMode, int displayId) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return;

        }

        try {

            service.showInputMethodPickerFromSystem(client, auxiliarySubtypeMode, displayId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static boolean isInputMethodPickerShownForTest() {

        final IInputMethodManager service = getService();

        if (service == null) {

            return false;

        }

        try {

            return service.isInputMethodPickerShownForTest();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @Nullable

    static InputMethodSubtype getCurrentInputMethodSubtype(@UserIdInt int userId) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return null;

        }

        try {

            return service.getCurrentInputMethodSubtype(userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static void setAdditionalInputMethodSubtypes(@NonNull String imeId,

            @NonNull InputMethodSubtype[] subtypes, @UserIdInt int userId) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return;

        }

        try {

            service.setAdditionalInputMethodSubtypes(imeId, subtypes, userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static void setExplicitlyEnabledInputMethodSubtypes(@NonNull String imeId,

            @NonNull int[] subtypeHashCodes, @UserIdInt int userId) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return;

        }

        try {

            service.setExplicitlyEnabledInputMethodSubtypes(imeId, subtypeHashCodes, userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static int getInputMethodWindowVisibleHeight(@NonNull IInputMethodClient client) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return 0;

        }

        try {

            return service.getInputMethodWindowVisibleHeight(client);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static void reportVirtualDisplayGeometryAsync(@NonNull IInputMethodClient client,

            int childDisplayId, @Nullable float[] matrixValues) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return;

        }

        try {

            service.reportVirtualDisplayGeometryAsync(client, childDisplayId, matrixValues);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static void reportPerceptibleAsync(@NonNull IBinder windowToken, boolean perceptible) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return;

        }

        try {

            service.reportPerceptibleAsync(windowToken, perceptible);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static void removeImeSurfaceFromWindowAsync(@NonNull IBinder windowToken) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return;

        }

        try {

            service.removeImeSurfaceFromWindowAsync(windowToken);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static void startStylusHandwriting(@NonNull IInputMethodClient client) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return;

        }

        try {

            service.startStylusHandwriting(client);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static boolean isStylusHandwritingAvailableAsUser(@UserIdInt int userId) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return false;

        }

        try {

            return service.isStylusHandwritingAvailableAsUser(userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static void addVirtualStylusIdForTestSession(IInputMethodClient client) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return;

        }

        try {

            service.addVirtualStylusIdForTestSession(client);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    static void setStylusWindowIdleTimeoutForTest(

            IInputMethodClient client, @DurationMillisLong long timeout) {

        final IInputMethodManager service = getService();

        if (service == null) {

            return;

        }

        try {

            service.setStylusWindowIdleTimeoutForTest(client, timeout);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }

}

core/java/android/view/inputmethod/IInputMethodManagerInvoker.java

deleted100644 → 0
+0 −288
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.view.inputmethod;



import android.annotation.AnyThread;

import android.annotation.DurationMillisLong;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.view.WindowManager;

import android.view.WindowManager.LayoutParams.SoftInputModeFlags;

import android.window.ImeOnBackInvokedDispatcher;



import com.android.internal.inputmethod.DirectBootAwareness;

import com.android.internal.inputmethod.IInputMethodClient;

import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection;

import com.android.internal.inputmethod.IRemoteInputConnection;

import com.android.internal.inputmethod.InputBindResult;

import com.android.internal.inputmethod.SoftInputShowHideReason;

import com.android.internal.inputmethod.StartInputFlags;

import com.android.internal.inputmethod.StartInputReason;

import com.android.internal.view.IInputMethodManager;



import java.util.List;



/**

 * A wrapper class to invoke IPCs defined in {@link IInputMethodManager}.

 */

final class IInputMethodManagerInvoker {

    @NonNull

    private final IInputMethodManager mTarget;



    private IInputMethodManagerInvoker(@NonNull IInputMethodManager target) {

        mTarget = target;

    }



    @AnyThread

    @NonNull

    static IInputMethodManagerInvoker create(@NonNull IInputMethodManager imm) {

        return new IInputMethodManagerInvoker(imm);

    }



    @AnyThread

    void addClient(@NonNull IInputMethodClient client,

            @NonNull IRemoteInputConnection fallbackInputConnection, int untrustedDisplayId) {

        try {

            mTarget.addClient(client, fallbackInputConnection, untrustedDisplayId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @NonNull

    List<InputMethodInfo> getInputMethodList(@UserIdInt int userId,

            @DirectBootAwareness int directBootAwareness) {

        try {

            return mTarget.getInputMethodList(userId, directBootAwareness);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @NonNull

    List<InputMethodInfo> getEnabledInputMethodList(@UserIdInt int userId) {

        try {

            return mTarget.getEnabledInputMethodList(userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @NonNull

    List<InputMethodSubtype> getEnabledInputMethodSubtypeList(@Nullable String imiId,

            boolean allowsImplicitlyEnabledSubtypes, @UserIdInt int userId) {

        try {

            return mTarget.getEnabledInputMethodSubtypeList(imiId,

                    allowsImplicitlyEnabledSubtypes, userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @Nullable

    InputMethodSubtype getLastInputMethodSubtype(@UserIdInt int userId) {

        try {

            return mTarget.getLastInputMethodSubtype(userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    boolean showSoftInput(@NonNull IInputMethodClient client, @Nullable IBinder windowToken,

            int flags, int lastClickToolType, @Nullable ResultReceiver resultReceiver,

            @SoftInputShowHideReason int reason) {

        try {

            return mTarget.showSoftInput(

                    client, windowToken, flags, lastClickToolType, resultReceiver, reason);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    boolean hideSoftInput(@NonNull IInputMethodClient client, @Nullable IBinder windowToken,

            int flags, @Nullable ResultReceiver resultReceiver,

            @SoftInputShowHideReason int reason) {

        try {

            return mTarget.hideSoftInput(client, windowToken, flags, resultReceiver, reason);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @NonNull

    InputBindResult startInputOrWindowGainedFocus(@StartInputReason int startInputReason,

            @NonNull IInputMethodClient client, @Nullable IBinder windowToken,

            @StartInputFlags int startInputFlags, @SoftInputModeFlags int softInputMode,

            @WindowManager.LayoutParams.Flags int windowFlags, @Nullable EditorInfo editorInfo,

            @Nullable IRemoteInputConnection remoteInputConnection,

            @Nullable IRemoteAccessibilityInputConnection remoteAccessibilityInputConnection,

            int unverifiedTargetSdkVersion, @UserIdInt int userId,

            @NonNull ImeOnBackInvokedDispatcher imeDispatcher) {

        try {

            return mTarget.startInputOrWindowGainedFocus(startInputReason, client, windowToken,

                    startInputFlags, softInputMode, windowFlags, editorInfo, remoteInputConnection,

                    remoteAccessibilityInputConnection, unverifiedTargetSdkVersion, userId,

                    imeDispatcher);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    void showInputMethodPickerFromClient(@NonNull IInputMethodClient client,

            int auxiliarySubtypeMode) {

        try {

            mTarget.showInputMethodPickerFromClient(client, auxiliarySubtypeMode);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    void showInputMethodPickerFromSystem(@NonNull IInputMethodClient client,

            int auxiliarySubtypeMode, int displayId) {

        try {

            mTarget.showInputMethodPickerFromSystem(client, auxiliarySubtypeMode, displayId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    boolean isInputMethodPickerShownForTest() {

        try {

            return mTarget.isInputMethodPickerShownForTest();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @Nullable

    InputMethodSubtype getCurrentInputMethodSubtype(@UserIdInt int userId) {

        try {

            return mTarget.getCurrentInputMethodSubtype(userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    void setAdditionalInputMethodSubtypes(@NonNull String imeId,

            @NonNull InputMethodSubtype[] subtypes, @UserIdInt int userId) {

        try {

            mTarget.setAdditionalInputMethodSubtypes(imeId, subtypes, userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    void setExplicitlyEnabledInputMethodSubtypes(@NonNull String imeId,

            @NonNull int[] subtypeHashCodes, @UserIdInt int userId) {

        try {

            mTarget.setExplicitlyEnabledInputMethodSubtypes(imeId, subtypeHashCodes, userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    int getInputMethodWindowVisibleHeight(@NonNull IInputMethodClient client) {

        try {

            return mTarget.getInputMethodWindowVisibleHeight(client);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    void reportVirtualDisplayGeometryAsync(@NonNull IInputMethodClient client, int childDisplayId,

            @Nullable float[] matrixValues) {

        try {

            mTarget.reportVirtualDisplayGeometryAsync(client, childDisplayId, matrixValues);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    void reportPerceptibleAsync(@NonNull IBinder windowToken, boolean perceptible) {

        try {

            mTarget.reportPerceptibleAsync(windowToken, perceptible);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    void removeImeSurfaceFromWindowAsync(@NonNull IBinder windowToken) {

        try {

            mTarget.removeImeSurfaceFromWindowAsync(windowToken);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    void startStylusHandwriting(@NonNull IInputMethodClient client) {

        try {

            mTarget.startStylusHandwriting(client);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    boolean isStylusHandwritingAvailableAsUser(@UserIdInt int userId) {

        try {

            return mTarget.isStylusHandwritingAvailableAsUser(userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    void addVirtualStylusIdForTestSession(IInputMethodClient client) {

        try {

            mTarget.addVirtualStylusIdForTestSession(client);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    void setStylusWindowIdleTimeoutForTest(

            IInputMethodClient client, @DurationMillisLong long timeout) {

        try {

            mTarget.setStylusWindowIdleTimeoutForTest(client, timeout);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }

}

core/java/android/view/inputmethod/InputMethodManager.java

+47 −46

File changed.

Preview size limit exceeded, changes collapsed.