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

Commit fcc38e6c authored by Paul Crowley's avatar Paul Crowley Committed by Android (Google) Code Review
Browse files

Merge "Hide notification before tie managed profile lock" into nyc-dev

parents a8f51e3e 84812583

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -340,8 +340,9 @@ public class LockSettingsService extends ILockSettings.Stub { 
    }

    }





    public void onUnlockUser(int userId) {

    public void onUnlockUser(int userId) {

        tieManagedProfileLockIfNecessary(userId, null);

        // Hide notification first, as tie managed profile lock takes time

        hideEncryptionNotification(new UserHandle(userId));

        hideEncryptionNotification(new UserHandle(userId));

        tieManagedProfileLockIfNecessary(userId, null);





        // Now we have unlocked the parent user we should show notifications

        // Now we have unlocked the parent user we should show notifications

        // about any profiles that exist.

        // about any profiles that exist.