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

Commit 42aa2e5e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use @EnforcePermission for IIMM#showInputMethodPickerFromSystem()"

parents 151d1879 f2e9812c

core/java/com/android/internal/view/IInputMethodManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ interface IInputMethodManager { 
    void showInputMethodPickerFromClient(in IInputMethodClient client,

            int auxiliarySubtypeMode);



    @EnforcePermission("WRITE_SECURE_SETTINGS")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.WRITE_SECURE_SETTINGS)")

    void showInputMethodPickerFromSystem(in IInputMethodClient client,

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

+1 −6
Original line number Diff line number Diff line
@@ -3993,15 +3993,10 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
        }

    }



    @EnforcePermission(Manifest.permission.WRITE_SECURE_SETTINGS)

    @Override

    public void showInputMethodPickerFromSystem(IInputMethodClient client, int auxiliarySubtypeMode,

            int displayId) {

        if (mContext.checkCallingPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS)

                != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException(

                    "showInputMethodPickerFromSystem requires WRITE_SECURE_SETTINGS "

                            + "permission");

        }

        // Always call subtype picker, because subtype picker is a superset of input method

        // picker.

        mHandler.obtainMessage(MSG_SHOW_IM_SUBTYPE_PICKER, auxiliarySubtypeMode, displayId)