From a8e3f77332f655b7d195e1c3e3e0ba931cb8c1cd Mon Sep 17 00:00:00 2001 From: Ricky Wai Date: Mon, 27 Jun 2016 15:51:52 +0100 Subject: [PATCH] Do not show user locked notification after reboot when there is no lock Bug: 29384349 Change-Id: I19995beacf565fff36d98558605694cdbe5bcedb --- .../core/java/com/android/server/LockSettingsService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index d64fe32cca555..85eee2bb27e29 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java @@ -300,7 +300,8 @@ public class LockSettingsService extends ILockSettings.Stub { for (int i = 0; i < users.size(); i++) { UserInfo user = users.get(i); UserHandle userHandle = user.getUserHandle(); - if (!mUserManager.isUserUnlockingOrUnlocked(userHandle)) { + final boolean isSecure = mStorage.hasPassword(user.id) || mStorage.hasPattern(user.id); + if (isSecure && !mUserManager.isUserUnlockingOrUnlocked(userHandle)) { if (!user.isManagedProfile()) { showEncryptionNotification(userHandle); } else { @@ -407,7 +408,9 @@ public class LockSettingsService extends ILockSettings.Stub { List profiles = mUserManager.getProfiles(userId); for (int i = 0; i < profiles.size(); i++) { UserInfo profile = profiles.get(i); - if (profile.isManagedProfile()) { + final boolean isSecure = + mStorage.hasPassword(profile.id) || mStorage.hasPattern(profile.id); + if (isSecure && profile.isManagedProfile()) { UserHandle userHandle = profile.getUserHandle(); if (!mUserManager.isUserUnlockingOrUnlocked(userHandle) && !mUserManager.isQuietModeEnabled(userHandle)) {