Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 844ebd76 authored by Ricky Wai's avatar Ricky Wai Committed by android-build-merger
Browse files

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

am: f32e96a8

Change-Id: If32cda85b7737d04ffc83fc6686c176f9e6910a1
parents 2249ae1c f32e96a8

services/core/java/com/android/server/LockSettingsService.java

+5 −2
Original line number Diff line number Diff line
@@ -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)) {