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

Commit be311b78 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Skip unlock requests for users who aren\'t running." into nyc-dev 

am: a66bffb0

* commit 'a66bffb0':
  Skip unlock requests for users who aren't running.

Change-Id: I790facda0a2e1d0b4deead7a60279baadfdd0a5b
parents 41bec764 a66bffb0

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

+2 −1
Original line number Diff line number Diff line
@@ -893,8 +893,9 @@ final class UserController { 
    boolean unlockUserCleared(final int userId, byte[] token, byte[] secret,

            ProgressReporter progress) {

        synchronized (mService) {

            // Bail if already running unlocked

            // Bail if already running unlocked, or if not running at all

            final UserState uss = mStartedUsers.get(userId);

            if (uss == null) return false;

            switch (uss.state) {

                case STATE_RUNNING_UNLOCKING:

                case STATE_RUNNING_UNLOCKED: