commit 1b3db4d5aaa7f94d22710111c05d1f8b3bc4197d
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Oct 06 19:17:29 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 06 19:17:29 2022 +0000
tree 22893643119a2b30d0d06ca189e3c02929fec022
parent 483cac85da59a08d9c2ccd1582c742bdb5c83561
parent 3cec57b92d708d146e7b17cbcc6f8b146b2ce2e5

Merge "Use UserManagerInternal#hasUserRestriction() in IMMS"

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

diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index 0ec2100..067c35f 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -6396,9 +6396,9 @@
      * @return {@code true} if userId has debugging privileges.
      * i.e. {@link UserManager#DISALLOW_DEBUGGING_FEATURES} is {@code false}.
      */
-    private boolean userHasDebugPriv(int userId, final ShellCommand shellCommand) {
-        if (mUserManager.hasUserRestriction(
-                UserManager.DISALLOW_DEBUGGING_FEATURES, UserHandle.of(userId))) {
+    private boolean userHasDebugPriv(@UserIdInt int userId, ShellCommand shellCommand) {
+        if (mUserManagerInternal.hasUserRestriction(
+                UserManager.DISALLOW_DEBUGGING_FEATURES, userId)) {
             shellCommand.getErrPrintWriter().println("User #" + userId
                     + " is restricted with DISALLOW_DEBUGGING_FEATURES.");
             return false;