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

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

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

parents 84ce5aff 80b2911d

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

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ interface IInputMethodManager { 
    boolean isStylusHandwritingAvailableAsUser(int userId);



    /** add virtual stylus id for test Stylus handwriting session **/

    @EnforcePermission("INJECT_EVENTS")

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

            + "android.Manifest.permission.INJECT_EVENTS)")

    void addVirtualStylusIdForTestSession(in IInputMethodClient client);

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

+1 −4
Original line number Diff line number Diff line
@@ -4460,12 +4460,9 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
     * a stylus deviceId is not already registered on device.

     */

    @BinderThread

    @RequiresPermission(Manifest.permission.INJECT_EVENTS)

    @EnforcePermission(Manifest.permission.INJECT_EVENTS)

    @Override

    public void addVirtualStylusIdForTestSession(IInputMethodClient client) {

        mContext.enforceCallingPermission(

                Manifest.permission.INJECT_EVENTS,

                "Using addVirtualStylusIdForTestSession() requires INJECT_EVENTS.");

        int uid = Binder.getCallingUid();

        synchronized (ImfLock.class) {

            if (!canInteractWithImeLocked(uid, client, "addVirtualStylusIdForTestSession")) {