From 7f6652b97ea5daec3364fef5b9226bf6a7d6a905 Mon Sep 17 00:00:00 2001 From: Anna Bauza Date: Wed, 11 Jan 2023 10:54:28 +0000 Subject: Extend MultiUserInfo with information does the device allow adding secondary users. Bug: 262359633 Test: atest MultiUserInfoStatsTests Change-Id: I998cc2bc00371e675ac87d46c2169e06a969fba4 --- services/core/java/com/android/server/pm/UserManagerService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 175c11dc3f44..54c6681612be 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -5222,7 +5222,10 @@ public class UserManagerService extends IUserManager.Stub { data.add(FrameworkStatsLog.buildStatsEvent(FrameworkStatsLog.MULTI_USER_INFO, UserManager.getMaxSupportedUsers(), - isUserSwitcherEnabled(deviceOwnerUserId))); + isUserSwitcherEnabled(deviceOwnerUserId), + UserManager.supportsMultipleUsers() + && !hasUserRestriction(UserManager.DISALLOW_ADD_USER, + deviceOwnerUserId))); } } else { Slogf.e(LOG_TAG, "Unexpected atom tag: %d", atomTag); -- cgit v1.2.3-59-g8ed1b