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

Merge "Fixes UMS.getPreCreatedUserLU() to ignore partial pre-created users." into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-28 16:18:15 +00:00
committed by Android (Google) Code Review
parent 0cb62fa9c7 f173defe6e
commit 26e995aaf0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4291,7 +4291,7 @@ public class UserManagerService extends IUserManager.Stub {
for (int i = 0; i < userSize; i++) { for (int i = 0; i < userSize; i++) {
final UserData user = mUsers.valueAt(i); final UserData user = mUsers.valueAt(i);
if (DBG) Slog.d(LOG_TAG, i + ":" + user.info.toFullString()); if (DBG) Slog.d(LOG_TAG, i + ":" + user.info.toFullString());
if (user.info.preCreated && user.info.userType.equals(userType)) { if (user.info.preCreated && !user.info.partial && user.info.userType.equals(userType)) {
if (!user.info.isInitialized()) { if (!user.info.isInitialized()) {
Slog.w(LOG_TAG, "found pre-created user of type " + userType Slog.w(LOG_TAG, "found pre-created user of type " + userType
+ ", but it's not initialized yet: " + user.info.toFullString()); + ", but it's not initialized yet: " + user.info.toFullString());