Merge "Fix bug in UserManager#getUserName" into sc-dev

This commit is contained in:
Kholoud Mohamed
2021-03-05 14:20:50 +00:00
committed by Android (Google) Code Review

View File

@@ -1544,7 +1544,7 @@ public class UserManagerService extends IUserManager.Stub {
public String getUserName() { public String getUserName() {
final int callingUid = Binder.getCallingUid(); final int callingUid = Binder.getCallingUid();
if (!hasManageOrCreateUsersPermission() if (!hasManageOrCreateUsersPermission()
|| hasPermissionGranted( && !hasPermissionGranted(
android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED, callingUid)) { android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED, callingUid)) {
throw new SecurityException("You need MANAGE_USERS or CREATE_USERS or " throw new SecurityException("You need MANAGE_USERS or CREATE_USERS or "
+ "GET_ACCOUNTS_PRIVILEGED permissions to: get user name"); + "GET_ACCOUNTS_PRIVILEGED permissions to: get user name");