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

2016-07-18 23:02:45 +00:00
parent 4e98676ed3 ba0665705b
commit 2b58e464bb
1 changed files with 9 additions and 3 deletions
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -352,9 +352,15 @@ final class UserController {
                final UserInfo info = getUserInfo(userId);
                if (!Objects.equals(info.lastLoggedInFingerprint, Build.FINGERPRINT)) {
                    // Suppress double notifications for managed profiles that
-                    // were unlocked automatically (no challenge token required)
-                    // as part of their parent user being unlocked.
-                    final boolean quiet = info.isManagedProfile() && !uss.tokenProvided;
+                    // were unlocked automatically as part of their parent user
+                    // being unlocked.
+                    final boolean quiet;
+                    if (info.isManagedProfile()) {
+                        quiet = !uss.tokenProvided
+                                || !mLockPatternUtils.isSeparateProfileChallengeEnabled(userId);
+                    } else {
+                        quiet = false;
+                    }
                    new PreBootBroadcaster(mService, userId, null, quiet) {
                        @Override
                        public void onFinished() {