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

Commit 4fbd956d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not show work profile encryption notification if already unlocked." into qt-dev

parents 22f9d7ea e13ce669

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

+6 −0
Original line number Diff line number Diff line
@@ -483,6 +483,12 @@ public class LockSettingsService extends ILockSettings.Stub { 
            return;

        }



        if (isUserKeyUnlocked(userId)) {

            // If storage is not locked, the user will be automatically unlocked so there is

            // no need to show the notification.

            return;

        }



        final UserHandle userHandle = user.getUserHandle();

        final boolean isSecure = isUserSecure(userId);

        if (isSecure && !mUserManager.isUserUnlockingOrUnlocked(userHandle)) {