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

Commit 35059f31 authored by Irina Dumitrescu's avatar Irina Dumitrescu Committed by android-build-merger
Browse files

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

am: 4fbd956d

Change-Id: I878589b789e9dc3b7dac4dc291fd4cd1fda3a1a3
parents a873befe 4fbd956d

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