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

Commit f52709c4 authored by Benjamin Franz's avatar Benjamin Franz
Browse files

Don't show the unlock notification when Work mode is off 

Currently we show the unlock work profile notification when work mode
is off. This CL stops this from happening.

Bug: 27764124
Change-Id: I63e4e09ab8c35a69d10118cf06d8ef33b1e1eb05
parent 002f7121

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

+5 −2
Original line number Diff line number Diff line
@@ -194,7 +194,9 @@ public class LockSettingsService extends ILockSettings.Stub { 
                    showEncryptionNotification(userHandle);

                } else {

                    UserInfo parent = mUserManager.getProfileParent(user.id);

                    if (parent != null && mUserManager.isUserUnlocked(parent.getUserHandle())) {

                    if (parent != null &&

                            mUserManager.isUserUnlocked(parent.getUserHandle()) &&

                            !mUserManager.isQuietModeEnabled(userHandle)) {

                        // Only show notifications for managed profiles once their parent

                        // user is unlocked.

                        showEncryptionNotificationForProfile(userHandle);
@@ -280,7 +282,8 @@ public class LockSettingsService extends ILockSettings.Stub { 
            UserInfo profile = profiles.get(i);

            if (profile.isManagedProfile()) {

                UserHandle userHandle = profile.getUserHandle();

                if (!mUserManager.isUserUnlocked(userHandle)) {

                if (!mUserManager.isUserUnlocked(userHandle) &&

                        !mUserManager.isQuietModeEnabled(userHandle)) {

                    showEncryptionNotificationForProfile(userHandle);

                }

            }