Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove redundant enforceCallingPermission()"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-25 08:30:04 +00:00
committed by Android (Google) Code Review
parent bad0bbfdc7 ecac6fd64e
commit 2fcc4501c9
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

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