summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anna Bauza <annabauza@google.com> 2023-01-11 10:54:28 +0000
committer Anna Bauza <annabauza@google.com> 2023-01-17 10:19:09 +0000
commit7f6652b97ea5daec3364fef5b9226bf6a7d6a905 (patch)
treef528b208fba234aac45cda295e70da1ed375ed67
parente67df620b8f242f5d7a89d323083df3070af35e0 (diff)
Extend MultiUserInfo with information does the device allow adding secondary users.
Bug: 262359633 Test: atest MultiUserInfoStatsTests Change-Id: I998cc2bc00371e675ac87d46c2169e06a969fba4
-rw-r--r--services/core/java/com/android/server/pm/UserManagerService.java5
1 files changed, 4 insertions, 1 deletions
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);