Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 095c67ba authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Removed FLAG_EPHEMERAL from pre-created users."

parents 7a80e94c d1def616

services/core/java/com/android/server/pm/UserManagerService.java

+8 −0
Original line number Diff line number Diff line
@@ -3210,6 +3210,13 @@ public class UserManagerService extends IUserManager.Stub { 
                        flags |= UserInfo.FLAG_EPHEMERAL;

                    }



                    // Always clear EPHEMERAL for pre-created users, otherwise the storage key

                    // won't be persisted. The flag will be re-added (if needed) when the

                    // pre-created user is "converted" to a normal user.

                    if (preCreate) {

                        flags &= ~UserInfo.FLAG_EPHEMERAL;

                    }



                    userInfo = new UserInfo(userId, name, null, flags, userType);

                    userInfo.serialNumber = mNextSerialNumber++;

                    userInfo.creationTime = getCreationTime();
@@ -4428,6 +4435,7 @@ public class UserManagerService extends IUserManager.Stub { 
        pw.println("  Supports switchable users: " + UserManager.supportsMultipleUsers());

        pw.println("  All guests ephemeral: " + Resources.getSystem().getBoolean(

                com.android.internal.R.bool.config_guestUserEphemeral));

        pw.println("  Force ephemeral users: " + mForceEphemeralUsers);

        pw.println("  Is split-system user: " + UserManager.isSplitSystemUser());

        pw.println("  Is headless-system mode: " + UserManager.isHeadlessSystemUserMode());

        pw.println("  User version: " + mUserVersion);