From 361ed635a3fbd39856e5ef8a53d0bfa6ff8935db Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Mon, 3 Oct 2022 19:54:32 -0700 Subject: [PATCH] Remove an incorrect @UserIdInt from InputMethodUtils This is a follow up CL to my previous CL [1], which incorrectly added @UserIdInt annotation to "uid" parameter in InputMethodUtils#checkIfPackageBelongsToUid(). As it is a uid not userId, @UserIdInt has never been appropriate for that parameter. This CL must have no observable behavior change since @UserIdInt doesn't change any runtime behavior. [1]: Ic33e94f2bdedaa2c573be0857727d901800e5bbf 4792bc1d998d0dd9a5031f6595c7b8fa46db66d6 Bug: 234882948 Test: presubmit Change-Id: I8d6f1689c3cff80421913d64c43e242744eccf36 --- .../java/com/android/server/inputmethod/InputMethodUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/inputmethod/InputMethodUtils.java b/services/core/java/com/android/server/inputmethod/InputMethodUtils.java index beeaa90a3832c..c57fe332867a0 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodUtils.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodUtils.java @@ -225,7 +225,7 @@ final class InputMethodUtils { * @return {@code true} if the package name belongs to the UID. */ static boolean checkIfPackageBelongsToUid(AppOpsManager appOpsManager, - @UserIdInt int uid, String packageName) { + int uid, String packageName) { try { appOpsManager.checkPackage(uid, packageName); return true;