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

Updated UserManager.isUserVisible() to check for profiles.

Browse Source 
Bug: 239824814

Test: test CtsMultiUserTestCases:android.multiuser.cts.UserManagerTest#testIsUserVisible_startedProfileOfCurrentUser
Test: test CtsMultiUserTestCases:android.multiuser.cts.UserManagerTest#testIsUserVisible_stoppedProfileOfCurrentUser

Change-Id: I4cb109496370e3a910ed0598948fc189f35c3ddd
This commit is contained in:
Felipe Leme
2022-08-08 15:14:53 -07:00
parent 36e74d4db8
commit a683350eb9
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -1650,14 +1650,37 @@ public class UserManagerService extends IUserManager.Stub {
}
int currentUser = Binder.withCleanCallingIdentity(() -> ActivityManager.getCurrentUser());
// TODO(b/179163496): should return true for profile users of the current user as well
return currentUser == userId;
}
@Override
public boolean isUserVisible(@UserIdInt int userId) {
// TODO(b/239824814): implement other cases like bg user, profile, user on secondary display
return isUserForeground(userId);
int callingUserId = UserHandle.getCallingUserId();
if (callingUserId != userId
&& !hasManageUsersOrPermission(android.Manifest.permission.INTERACT_ACROSS_USERS)) {
throw new SecurityException("Caller from user " + callingUserId + " needs MANAGE_USERS "
+ "or INTERACT_ACROSS_USERS permission to check if another user (" + userId
+ ") is visible");
}
// First check current foreground user (on main display)
int currentUserId = Binder.withCleanCallingIdentity(() -> ActivityManager.getCurrentUser());
if (currentUserId == userId) {
return true;
}
// Then profiles of current user
// TODO(b/239824814): consider using AMInternal.isCurrentProfile() instead
if (isProfile(userId)) {
int parentId = Binder.withCleanCallingIdentity(() -> getProfileParentId(userId));
if (parentId == currentUserId) {
return isUserRunning(userId);
}
}
// TODO(b/239824814): support background users on secondary display (and their profiles)
return false;
}
@Override