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

Merge "Merge "Notify caller when unlockUser() bails out" am: e7df4aa57c am: 030f2bd0ac am: 96fa2e2417"

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-03-19 18:49:10 +00:00
committed by Android (Google) Code Review
parent 9812bc26af 000d88df2d
commit 3d0a536ec8
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/am/UserController.java
View File

@@ -389,14 +389,14 @@ class UserController implements Handler.Callback {
* Step from {@link UserState#STATE_RUNNING_LOCKED} to
* {@link UserState#STATE_RUNNING_UNLOCKING}.
*/
private void finishUserUnlocking(final UserState uss) {
private boolean finishUserUnlocking(final UserState uss) {
final int userId = uss.mHandle.getIdentifier();
// Only keep marching forward if user is actually unlocked
if (!StorageManager.isUserKeyUnlocked(userId)) return;
if (!StorageManager.isUserKeyUnlocked(userId)) return false;
synchronized (mLock) {
// Do not proceed if unexpected state or a stale user
if (mStartedUsers.get(userId) != uss || uss.state != STATE_RUNNING_LOCKED) {
return;
return false;
}
}
uss.mUnlockProgress.start();
@@ -427,6 +427,7 @@ class UserController implements Handler.Callback {
mHandler.obtainMessage(SYSTEM_USER_UNLOCK_MSG, userId, 0, uss)
.sendToTarget();
});
return true;
}
/**
@@ -1209,7 +1210,10 @@ class UserController implements Handler.Callback {
return false;
}
finishUserUnlocking(uss);
if (!finishUserUnlocking(uss)) {
notifyFinished(userId, listener);
return false;
}
// We just unlocked a user, so let's now attempt to unlock any
// managed profiles under that user.