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

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

Merge "Use removeUserEvenWhenDisallowed for removing ephemeral user"

parents 940acac9 1df89814

services/core/java/com/android/server/am/UserController.java

+1 −1
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ class UserController implements Handler.Callback { 
            mInjector.stackSupervisorRemoveUser(userId);

            // Remove the user if it is ephemeral.

            if (getUserInfo(userId).isEphemeral()) {

                mInjector.getUserManager().removeUser(userId);

                mInjector.getUserManager().removeUserEvenWhenDisallowed(userId);

            }

            // Evict the user's credential encryption key.

            try {