Improved AbstractMasterSystemService to handle supported user types.
Also changed AutofillManagerService and ContentCaptureManagerService to take advantage of these methods.
Test: manual verification
Test: atest CtsAutoFillServiceTestCases CtsContentCaptureServiceTestCases # on phone and Automotive
Bug: 133242016
Change-Id: I3e7f9d65a6ef1e8e6ec886a41b35733e463a6389
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 1fe5512..65fb35d 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -4180,6 +4180,17 @@
}
return userData == null ? null : userData.info;
}
+
+ public @NonNull UserInfo[] getUserInfos() {
+ synchronized (mUsersLock) {
+ int userSize = mUsers.size();
+ UserInfo[] allInfos = new UserInfo[userSize];
+ for (int i = 0; i < userSize; i++) {
+ allInfos[i] = mUsers.valueAt(i).info;
+ }
+ return allInfos;
+ }
+ }
}
/* Remove all the users except of the system one. */