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

Merge "Do not show user locked notification after reboot when there is no lock" into nyc-mr1-dev

Browse Source
This commit is contained in:
Ricky Wai
2016-07-07 11:05:54 +00:00
committed by Android (Google) Code Review
parent b0a574fbfc a8e3f77332
commit f32e96a8df
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/LockSettingsService.java
View File

@@ -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<UserInfo> 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)) {