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

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

@@ -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

@@ -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")) {