Merge "getUserLogoutability() to have user id as argument" into main

1 files changed, 3 insertions, 4 deletions

diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 08365c935626..33bf4a29ecc6 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -2776,7 +2776,7 @@ public class UserManager {
     }
 
     /**
-     * Returns whether logging out is currently allowed for the context user.
+     * Returns whether logging out is currently allowed for the specified user.
      *
      * <p>Logging out is not allowed in the following cases:
      * <ol>
@@ -2794,11 +2794,10 @@ public class UserManager {
      * {@link #LOGOUTABILITY_STATUS_CANNOT_SWITCH}.
      * @hide
      */
-    @UserHandleAware
     @RequiresPermission(Manifest.permission.MANAGE_USERS)
-    public @UserLogoutability int getUserLogoutability() {
+    public @UserLogoutability int getUserLogoutability(@UserIdInt int userId) {
         try {
-            return mService.getUserLogoutability(mUserId);
+            return mService.getUserLogoutability(userId);
         } catch (RemoteException re) {
             throw re.rethrowFromSystemServer();
         }