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

Commit 3ddfe673 authored by Wilson Wu's avatar Wilson Wu
Browse files

Disallow onCreateInputMethodSessionInterface overriden 

Add a compatibility change to forbit IMEs to override
the deprecated onCreateInputMethodSessionInterface
method from U.

Bug: 148086656
Test: presubmit
Change-Id: I002c895ce977cf7ed4ef40019c831ccbd9b6450d
parent fe8bf190

core/java/android/inputmethodservice/InputMethodService.java

+32 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import android.annotation.TestApi; 
import android.annotation.UiContext;

import android.app.ActivityManager;

import android.app.Dialog;

import android.app.compat.CompatChanges;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledSince;

import android.compat.annotation.UnsupportedAppUsage;
@@ -546,6 +547,20 @@ public class InputMethodService extends AbstractInputMethodService { 
    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.S)

    public static final long FINISH_INPUT_NO_FALLBACK_CONNECTION = 156215187L; // This is a bug id.



    /**

     * Disallow IMEs to override {@link InputMethodService#onCreateInputMethodSessionInterface()}

     * method.

     *

     * <p>If IMEs targeting on Android U and beyond override the

     * {@link InputMethodService#onCreateInputMethodSessionInterface()}, an {@link LinkageError}

     * would be thrown.</p>

     *

     * @hide

     */

    @ChangeId

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)

    private static final long DISALLOW_INPUT_METHOD_INTERFACE_OVERRIDE = 148086656L;



    LayoutInflater mInflater;

    TypedArray mThemeAttrs;

    @UnsupportedAppUsage
@@ -1532,6 +1547,11 @@ public class InputMethodService extends AbstractInputMethodService { 
    }



    @Override public void onCreate() {

        if (methodIsOverridden("onCreateInputMethodSessionInterface")

                && CompatChanges.isChangeEnabled(DISALLOW_INPUT_METHOD_INTERFACE_OVERRIDE)) {

            throw new LinkageError("InputMethodService#onCreateInputMethodSessionInterface()"

                    + " can no longer be overridden!");

        }

        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMS.onCreate");

        mTheme = Resources.selectSystemTheme(mTheme,

                getApplicationInfo().targetSdkVersion,
@@ -1769,6 +1789,9 @@ public class InputMethodService extends AbstractInputMethodService { 
     * {@link InputMethodService#onDisplayCompletions(CompletionInfo[])},

     * {@link InputMethodService#onUpdateExtractedText(int, ExtractedText)},

     * {@link InputMethodService#onUpdateSelection(int, int, int, int, int, int)} instead.

     *

     * <p>IMEs targeting on Android U and above cannot override this method, or an

     * {@link LinkageError} would be thrown.</p>

     */

    @Deprecated

    @Override
@@ -4064,4 +4087,13 @@ public class InputMethodService extends AbstractInputMethodService { 
        final KeyEvent upEvent = createBackKeyEvent(KeyEvent.ACTION_UP, hasStartedTracking);

        onKeyUp(KeyEvent.KEYCODE_BACK, upEvent);

    }



    private boolean methodIsOverridden(String methodName, Class<?>... parameterTypes) {

        try {

            return getClass().getMethod(methodName, parameterTypes).getDeclaringClass()

                    != InputMethodService.class;

        } catch (NoSuchMethodException e) {

            throw new RuntimeException("Method must exist.", e);

        }

    }

}