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

Merge "Handle auto-unlocked managed profiles." into nyc-mr1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2016-07-18 23:02:45 +00:00
committed by Android (Google) Code Review
parent 4e98676ed3 ba0665705b
commit 2b58e464bb
1 changed files with 9 additions and 3 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

@@ -352,9 +352,15 @@ final class UserController {
final UserInfo info = getUserInfo(userId); final UserInfo info = getUserInfo(userId);
if (!Objects.equals(info.lastLoggedInFingerprint, Build.FINGERPRINT)) { if (!Objects.equals(info.lastLoggedInFingerprint, Build.FINGERPRINT)) {
// Suppress double notifications for managed profiles that // Suppress double notifications for managed profiles that
// were unlocked automatically (no challenge token required) // were unlocked automatically as part of their parent user
// as part of their parent user being unlocked. // being unlocked.
final boolean quiet = info.isManagedProfile() && !uss.tokenProvided; final boolean quiet;
if (info.isManagedProfile()) {
quiet = !uss.tokenProvided
|| !mLockPatternUtils.isSeparateProfileChallengeEnabled(userId);
} else {
quiet = false;
}
new PreBootBroadcaster(mService, userId, null, quiet) { new PreBootBroadcaster(mService, userId, null, quiet) {
@Override @Override
public void onFinished() { public void onFinished() {