diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index be7e8a0a6dcf9..cddbad64f2fdd 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -64,7 +64,6 @@ import android.annotation.EnforcePermission; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.RequiresPermission; import android.annotation.UiThread; import android.annotation.UserIdInt; import android.app.ActivityManager; @@ -5863,22 +5862,10 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub mService = service; } - @RequiresPermission(allOf = { - Manifest.permission.DUMP, - Manifest.permission.INTERACT_ACROSS_USERS_FULL, - Manifest.permission.WRITE_SECURE_SETTINGS, - }) @BinderThread @ShellCommandResult @Override public int onCommand(@Nullable String cmd) { - // For shell command, require all the permissions here in favor of code simplicity. - Arrays.asList( - Manifest.permission.DUMP, - Manifest.permission.INTERACT_ACROSS_USERS_FULL, - Manifest.permission.WRITE_SECURE_SETTINGS - ).forEach(permission -> mService.mContext.enforceCallingPermission(permission, null)); - final long identity = Binder.clearCallingIdentity(); try { return onCommandWithSystemIdentity(cmd);